diff --git a/TestSelenium.js b/TestSelenium.js
index 330e62d2e..9623577b5 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -1,6 +1,11 @@
 /* global process */
 var WebDriver = require("selenium-webdriver");
 
+if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false') {
+    // We can't do saucelabs on pull requests so don't fail.
+    return;
+}
+
 var driver;
 if (process.env.SAUCE_USERNAME !== undefined) {
     var browserArray = process.env.BROWSER.split(':');
diff --git a/www/pad/index.html b/www/pad/index.html
index 8437073af..7d4c3125a 100644
--- a/www/pad/index.html
+++ b/www/pad/index.html
@@ -3,6 +3,7 @@
 <head>
     <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" type="image/png"
         href="/customize/main-favicon.png"
         data-main-favicon="/customize/main-favicon.png"
diff --git a/www/pad/inner.html b/www/pad/inner.html
index 1fc7b0cfe..0b04b9a5b 100644
--- a/www/pad/inner.html
+++ b/www/pad/inner.html
@@ -6,6 +6,9 @@
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
     <script src="/bower_components/ckeditor/ckeditor.js"></script>
     <style>
+    html, body {
+        margin: 0px;
+    }
     #cke_1_top {
         overflow: visible;
     }
diff --git a/www/pad/main.js b/www/pad/main.js
index f96cdcb28..9ec08407d 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -763,9 +763,17 @@ define([
 
     var first = function () {
         Ckeditor = ifrw.CKEDITOR;
-
         if (Ckeditor) {
             //andThen(Ckeditor);
+            // mobile configuration
+            Ckeditor.config.toolbarCanCollapse = true;
+            Ckeditor.config.height = '72vh';
+            if (screen.height < 800) {
+              Ckeditor.config.toolbarStartupExpanded = false;
+              $('meta[name=viewport]').attr('content', 'width=device-width, initial-scale=1.0, user-scalable=no');
+            } else {
+              $('meta[name=viewport]').attr('content', 'width=device-width, initial-scale=1.0, user-scalable=yes');
+            }
             second(Ckeditor);
         } else {
             console.log("Ckeditor was not defined. Trying again in %sms",interval);
