5 files changed, 17 insertions, 2 deletions
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 090e54c7b..6bf9426c4 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -219,7 +219,7 @@
 }
 
 #contactpic img {
-	width: 112px;
+	max-width: 112px;
 	visibility: inherit;
 }
 
diff --git a/skins/larry/includes/links.html b/skins/larry/includes/links.html
index 8bd8012e1..69e477c2d 100644
--- a/skins/larry/includes/links.html
+++ b/skins/larry/includes/links.html
@@ -1,4 +1,5 @@
 <meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
+<meta name="viewport" content="" id="viewport" />
 <link rel="shortcut icon" href="/images/favicon.ico"/>
 <link rel="stylesheet" type="text/css" href="/styles.css" />
 <roundcube:if condition="in_array(env:task, array('mail','addressbook','settings'))" />
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 288b010ed..09c7a60ed 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -929,6 +929,15 @@ a.iconlink.upload {
 	background-repeat: no-repeat;
 }
 
+/* fix scrolling within iframes in webkit browsers on touch devices */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	.iframebox {
+		overflow: auto;
+		-webkit-overflow-scrolling: touch;
+	}
+}
+
+
 /*** lists ***/
 
 .listbox {
@@ -1670,6 +1679,7 @@ ul.proplist li {
 	-o-box-shadow: none;
 	background: url(images/buttons.png) -100px 0 no-repeat transparent;
 	border: 0;
+	border-radius: 0;
 }
 
 .toolbar a.button.disabled {
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 3d7499f80..f2c52c820 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -112,7 +112,7 @@
 
 <div id="mailview-bottom" class="uibox">
 
-<div id="mailpreviewframe">
+<div id="mailpreviewframe" class="iframebox">
 <roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 </div>
 
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index e5733bd23..ae14d81b2 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -52,6 +52,10 @@ function rcube_mail_ui()
     if (parseInt(minmode) || (minmode === null && $(window).height() < 850)) {
       $(document.body).addClass('minimal');
     }
+
+    if (bw.tablet) {
+      $('#viewport').attr('content', "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0");
+    }
   }