diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 76767a9a2..32f2bb8f2 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -47,7 +47,7 @@ define(function () {
 
     out.disconnected = 'Déconnecté';
     out.synchronizing = 'Synchronisation';
-    out.reconnecting = 'Reconnexion...';
+    out.reconnecting = 'Reconnexion';
     out.typing = "Édition";
     out.initializing = "Initialisation...";
     out.forgotten = 'Déplacé vers la corbeille';
@@ -361,7 +361,7 @@ define(function () {
     out.fm_templateName = "Modèles";
     out.fm_searchName = "Recherche";
     out.fm_recentPadsName = "Pads récents";
-    out.fm_ownedPadsName = "Possédés";
+    out.fm_ownedPadsName = "Pads possédés";
     out.fm_searchPlaceholder = "Rechercher...";
     out.fm_newButton = "Nouveau";
     out.fm_newButtonTitle = "Créer un nouveau pad ou un dossier, importer un fichier dans le dossier courant";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index a73ce596b..5daa52219 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -48,7 +48,7 @@ define(function () {
 
     out.disconnected = 'Disconnected';
     out.synchronizing = 'Synchronizing';
-    out.reconnecting = 'Reconnecting...';
+    out.reconnecting = 'Reconnecting';
     out.typing = "Editing";
     out.initializing = "Initializing...";
     out.forgotten = 'Moved to the trash';
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index d5a4e7896..a095122d6 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -325,11 +325,11 @@ define([
         var onConnectionChange = function (info) {
             if (state === STATE.DELETED) { return; }
             stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED);
-            if (info.state) {
+            /*if (info.state) {
                 UI.findOKButton().click();
             } else {
                 UI.alert(Messages.common_connectionLost, undefined, true);
-            }
+            }*/
         };
 
         var onError = function (err) {
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 38cb2d759..f8937d777 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -1048,6 +1048,13 @@ define([
         toolbar.reconnecting = function (/*userId*/) {
             toolbar.connected = false;
             if (toolbar.spinner) {
+                var state = -1;
+                var interval = window.setInterval(function () {
+                    if (toolbar.connected) { clearInterval(interval); }
+                    var dots = Array(state+1).join('.');
+                    toolbar.spinner.text(Messages.reconnecting + dots);
+                    if (++state > 3) { state = 0; }
+                }, 500);
                 toolbar.spinner.text(Messages.reconnecting);
             }
         };
diff --git a/www/drive/inner.js b/www/drive/inner.js
index 58d547b0e..9576bd9d4 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -237,7 +237,7 @@ define([
                     'tabindex': '-1',
                     'data-icon': faFolder,
                 }, Messages.fc_newfolder)),
-                h('li', h('a.cp-app-drive-context-hashtag.dropdown-item', {
+                h('li', h('a.cp-app-drive-context-hashtag.dropdown-item.cp-app-drive-context-editable', {
                     'tabindex': '-1',
                     'data-icon': faTags,
                 }, Messages.fc_hashtag)),
diff --git a/www/poll/inner.js b/www/poll/inner.js
index a8deebbfe..577a54ff7 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -1117,13 +1117,13 @@ define([
             });
         }
         setEditable(false);
-        UI.alert(Messages.common_connectionLost, undefined, true);
+        //UI.alert(Messages.common_connectionLost, undefined, true);
     };
 
     var onReconnect = function () {
         if (APP.unrecoverable) { return; }
         setEditable(true);
-        UI.findOKButton().click();
+        //UI.findOKButton().click();
     };
 
     var getHeadingText = function () {
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index efa8edd87..8a4da8940 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -616,9 +616,9 @@ define([
             setEditable(info.state);
             if (info.state) {
                 initializing = true;
-                UI.findOKButton().click();
+                //UI.findOKButton().click();
             } else {
-                UI.alert(Messages.common_connectionLost, undefined, true);
+                //UI.alert(Messages.common_connectionLost, undefined, true);
             }
         };