diff --git a/program/js/common.js b/program/js/common.js
index dcab781b2..08990b9f9 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -89,8 +89,8 @@ function roundcube_browser()
   if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
     this.lang = RegExp.$1;
 
-  this.tablet = /ipad|android|xoom|sch-i800|playbook|tablet|kindle/i.test(this.agent_lc);
   this.mobile = /iphone|ipod|blackberry|iemobile|opera mini|opera mobi|mobile/i.test(this.agent_lc);
+  this.tablet = !this.mobile && /ipad|android|xoom|sch-i800|playbook|tablet|kindle/i.test(this.agent_lc);
   this.touch = this.mobile || this.tablet;
   this.pointer = typeof window.PointerEvent == "function";
   this.cookies = n.cookieEnabled;