diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 999e5802c8..49c3a06edf 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -71,6 +71,15 @@
    "options": "", 
    "permlevel": 0
   }, 
+  {
+   "default": "720:00", 
+   "description": "In Hours", 
+   "fieldname": "session_expiry_mobile", 
+   "fieldtype": "Data", 
+   "label": "Session Expiry Mobile", 
+   "permlevel": 0, 
+   "precision": ""
+  }, 
   {
    "description": "Run scheduled jobs only if checked", 
    "fieldname": "enable_scheduler", 
@@ -91,7 +100,7 @@
  ], 
  "icon": "icon-cog", 
  "issingle": 1, 
- "modified": "2015-05-03 10:35:04.415621", 
+ "modified": "2015-05-18 05:11:38.759688", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "System Settings", 
diff --git a/frappe/core/doctype/system_settings/system_settings.py b/frappe/core/doctype/system_settings/system_settings.py
index b49ee6d553..0e26b8edd5 100644
--- a/frappe/core/doctype/system_settings/system_settings.py
+++ b/frappe/core/doctype/system_settings/system_settings.py
@@ -11,10 +11,11 @@ from frappe.utils.momentjs import get_all_timezones
 
 class SystemSettings(Document):
 	def validate(self):
-		if self.session_expiry:
-			parts = self.session_expiry.split(":")
-			if len(parts)!=2 or not (cint(parts[0]) or cint(parts[1])):
-				frappe.throw(_("Session Expiry must be in format {0}").format("hh:mm"))
+		for key in ("session_expiry", "session_expiry_mobile"):
+			if self.get(key):
+				parts = self.get(key).split(":")
+				if len(parts)!=2 or not (cint(parts[0]) or cint(parts[1])):
+					frappe.throw(_("Session Expiry must be in format {0}").format("hh:mm"))
 
 	def on_update(self):
 		for df in self.meta.get("fields"):
diff --git a/frappe/data/Framework.sql b/frappe/data/Framework.sql
index 92d90a3da7..724a303756 100644
--- a/frappe/data/Framework.sql
+++ b/frappe/data/Framework.sql
@@ -175,6 +175,7 @@ CREATE TABLE `tabSessions` (
   `sessiondata` longtext,
   `ipaddress` varchar(16) DEFAULT NULL,
   `lastupdate` datetime(6) DEFAULT NULL,
+  `device` datetime(6) DEFAULT "desktop",
   `status` varchar(20) DEFAULT NULL,
   KEY `sid` (`sid`)
 ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 500939f9ab..cca44b24d9 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -78,3 +78,4 @@ frappe.patches.v5_0.move_scheduler_last_event_to_system_settings
 execute:frappe.db.sql("update tabUser set new_password='' where ifnull(new_password, '')!=''")
 frappe.patches.v5_0.fix_text_editor_file_urls
 execute:frappe.db.sql("update `tabComment` set comment_type='Comment' where comment_doctype='Blog Post' and ifnull(comment_type, '')=''")
+frappe.patches.v5_0.modify_session
diff --git a/frappe/patches/v5_0/modify_session.py b/frappe/patches/v5_0/modify_session.py
new file mode 100644
index 0000000000..122982da07
--- /dev/null
+++ b/frappe/patches/v5_0/modify_session.py
@@ -0,0 +1,4 @@
+import frappe
+
+def execute():
+	frappe.db.sql("alter table tabSessions add column `device` varchar(255) default 'desktop'")
diff --git a/frappe/public/js/frappe/form/footer/attachments.js b/frappe/public/js/frappe/form/footer/attachments.js
index 198fba1e4a..5672588dae 100644
--- a/frappe/public/js/frappe/form/footer/attachments.js
+++ b/frappe/public/js/frappe/form/footer/attachments.js
@@ -69,7 +69,7 @@ frappe.ui.form.Attachments = Class.extend({
 					<span>%(file_name)s</span></a>\
 			</li>', {
 				file_name: file_name,
-				file_url: file_url
+				file_url: frappe.urllib.get_full_url(file_url)
 			}))
 			.insertAfter(this.attachments_label.addClass("has-attachments"));
 
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 3fb3e3c759..52065badc7 100644
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -222,6 +222,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				+__("Add Attachments")+"</h6>").appendTo(attach.empty());
 			$.each(files, function(i, f) {
 				if (!f.file_name) return;
+				f.file_url = frappe.urllib.get_full_url(f.file_url);
 
 				$(repl('<p class="checkbox">'
 					+	'<label><span><input type="checkbox" data-file-name="%(name)s"></input></span>'
diff --git a/frappe/sessions.py b/frappe/sessions.py
index 7af58742ee..40b15f57ea 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -54,7 +54,8 @@ def clear_sessions(user=None, keep_current=False):
 	if not user:
 		user = frappe.session.user
 
-	for sid in frappe.db.sql("""select sid from tabSessions where user=%s""", (user,)):
+	for sid in frappe.db.sql("""select sid from tabSessions where user=%s and device=%s""",
+		(user, frappe.session.device or "desktop")):
 		if keep_current and frappe.session.sid==sid[0]:
 			continue
 		else:
@@ -75,9 +76,11 @@ def clear_all_sessions():
 
 def clear_expired_sessions():
 	"""This function is meant to be called from scheduler"""
-	for sid in frappe.db.sql_list("""select sid
-		from tabSessions where TIMEDIFF(NOW(), lastupdate) > TIME(%s)""", get_expiry_period()):
-		delete_session(sid)
+	for device in ("desktop", "mobile"):
+		for sid in frappe.db.sql_list("""select sid from tabSessions
+				where TIMEDIFF(NOW(), lastupdate) > TIME(%s)
+				and device = %s""", (device, get_expiry_period(device))):
+			delete_session(sid)
 
 def get():
 	"""get session boot info"""
@@ -128,6 +131,7 @@ class Session:
 	def __init__(self, user, resume=False, full_name=None, user_type=None):
 		self.sid = cstr(frappe.form_dict.get('sid') or unquote(frappe.request.cookies.get('sid', 'Guest')))
 		self.user = user
+		self.device = frappe.form_dict.get("device") or "desktop"
 		self.user_type = user_type
 		self.full_name = full_name
 		self.data = frappe._dict({'data': frappe._dict({})})
@@ -154,11 +158,14 @@ class Session:
 		self.data.data.user = self.user
 		self.data.data.session_ip = frappe.local.request_ip
 		if self.user != "Guest":
-			self.data.data.last_updated = frappe.utils.now()
-			self.data.data.session_expiry = get_expiry_period()
-			self.data.data.full_name = self.full_name
-			self.data.data.user_type = self.user_type
-		self.data.data.session_country = get_geo_ip_country(frappe.local.request_ip)
+			self.data.update({
+				"last_updated": frappe.utils.now(),
+				"session_expiry": get_expiry_period(self.device),
+				"full_name": self.full_name,
+				"user_type": self.user_type,
+				"device": self.device,
+				"session_country": get_geo_ip_country(frappe.local.request_ip)
+			})
 
 		# insert session
 		if self.user!="Guest":
@@ -171,9 +178,9 @@ class Session:
 
 	def insert_session_record(self):
 		frappe.db.sql("""insert into tabSessions
-			(sessiondata, user, lastupdate, sid, status)
-			values (%s , %s, NOW(), %s, 'Active')""",
-				(str(self.data['data']), self.data['user'], self.data['sid']))
+			(sessiondata, user, lastupdate, sid, status, device)
+			values (%s , %s, NOW(), %s, 'Active', %s)""",
+				(str(self.data['data']), self.data['user'], self.data['sid'], self.device))
 
 		# also add to memcache
 		frappe.cache().hset("session", self.data.sid, self.data)
@@ -218,6 +225,8 @@ class Session:
 		if data:
 			data = frappe._dict(data)
 			session_data = data.get("data", {})
+
+			# set user for correct timezone
 			frappe.session.user = session_data.get("user")
 			self.time_diff = frappe.utils.time_diff_in_seconds(frappe.utils.now(),
 				session_data.get("last_updated"))
@@ -234,7 +243,7 @@ class Session:
 		rec = frappe.db.sql("""select user, sessiondata
 			from tabSessions where sid=%s and
 			TIMEDIFF(NOW(), lastupdate) < TIME(%s)""", (self.sid,
-				get_expiry_period()))
+				get_expiry_period(self.device)))
 		if rec:
 			data = frappe._dict(eval(rec and rec[0][1] or '{}'))
 			data.user = rec[0][0]
@@ -286,8 +295,14 @@ class Session:
 
 		return updated_in_db
 
-def get_expiry_period():
-	exp_sec = frappe.defaults.get_global_default("session_expiry") or "06:00:00"
+def get_expiry_period(device="desktop"):
+	if device=="desktop":
+		key = "session_expiry"
+		default = "06:00:00"
+	else:
+		key = "session_expiry_mobile"
+		default = "720:00:00"
+	exp_sec = frappe.defaults.get_global_default(key) or default
 
 	# incase seconds is missing
 	if len(exp_sec.split(':')) == 2: