diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index f2491b7da0..4a349cada5 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -116,7 +116,7 @@ $.extend(frappe.desktop, {
},
make_sortable: function() {
- if ('ontouchstart' in window) {
+ if (frappe.dom.is_touchscreen()) {
return;
}
diff --git a/frappe/desk/page/messages/messages.js b/frappe/desk/page/messages/messages.js
index 4b505c362a..5f9fd4bd46 100644
--- a/frappe/desk/page/messages/messages.js
+++ b/frappe/desk/page/messages/messages.js
@@ -75,6 +75,14 @@ frappe.desk.pages.messages = Class.extend({
this.page.main.html($(frappe.render_template("messages_main", { "contact": contact })));
+ this.page.main.find(".messages-textarea").on("focusout", function() {
+ // on touchscreen devices, scroll to top
+ // so that static navbar and page head don't overlap the textarea
+ if (frappe.dom.is_touchscreen()) {
+ frappe.ui.scroll($(this).parents(".message-box"));
+ }
+ });
+
this.page.main.find(".btn-post").on("click", function() {
var btn = $(this);
var message_box = btn.parents(".message-box");
diff --git a/frappe/desk/page/messages/messages_main.html b/frappe/desk/page/messages/messages_main.html
index b401b009ad..33b95cb8c0 100644
--- a/frappe/desk/page/messages/messages_main.html
+++ b/frappe/desk/page/messages/messages_main.html
@@ -5,7 +5,7 @@
+ class="form-control messages-textarea">