diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index 0691ffd9e..ee5472490 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -466,6 +466,7 @@
             padding: 0.25em 0.75em;
             margin: 1em;
             background: @drive_info-box-bg;
+            cursor: default;
             span {
                 cursor: pointer;
                 float: right;
@@ -976,5 +977,28 @@
             flex: 1;
         }
     }
+
+    #cp-app-drive-edition-state {
+        height: @variables_bar-height;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: lighten(@colortheme_drive-bg, 32%);
+        color: black;
+        font-weight: bold;
+        text-transform: uppercase;
+        cursor: default;
+    }
+    #cp-app-drive-connection-state {
+        height: @variables_bar-height;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #eb675e;
+        color: white;
+        font-weight: bold;
+        text-transform: uppercase;
+        cursor: default;
+    }
 }
 
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 4bf2367e2..1badf239e 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -252,15 +252,18 @@ define([
         return APP.store[LS_SEARCHCURSOR] || 0;
     };
 
+    // Handle disconnect/reconnect
     var setEditable = function (state) {
-        APP.editable = state;
-        if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
+        if (APP.closed || !APP.$content || !$.contains(document.documentElement, APP.$content[0])) { return; }
+        APP.editable = !APP.readOnly && state;
         if (!state) {
             APP.$content.addClass('cp-app-drive-readonly');
+            $('#cp-app-drive-connection-state').show();
             $('[draggable="true"]').attr('draggable', false);
         }
         else {
             APP.$content.removeClass('cp-app-drive-readonly');
+            $('#cp-app-drive-connection-state').hide();
             $('[draggable="false"]').attr('draggable', true);
         }
     };
@@ -531,6 +534,8 @@ define([
         APP.hideDuplicateOwned = Util.find(priv, ['settings', 'drive', 'hideDuplicate']);
         APP.closed = false;
 
+        var $readOnly = $('#cp-app-drive-edition-state');
+
         var updateObject = driveConfig.updateObject;
         var updateSharedFolders = driveConfig.updateSharedFolders;
 
@@ -608,9 +613,7 @@ define([
             }
         }
 
-        if (!APP.readOnly) {
-            setEditable(true);
-        }
+        APP.editable = !APP.readOnly;
         var appStatus = {
             isReady: true,
             _onReady: [],
@@ -1091,8 +1094,10 @@ define([
 
             var show = [];
             var filter;
+            var editable = true;
 
             if (type === "content") {
+                if (APP.$content.data('readOnlyFolder')) { editable = false; }
                 // Return true in filter to hide
                 filter = function ($el, className) {
                     if (className === 'newfolder') { return; }
@@ -1212,6 +1217,9 @@ define([
                             hide.push('removesf');
                         }
                     }
+                    if ($element.closest('[data-ro]').length) {
+                        editable = false;
+                    }
                 });
                 if (paths.length > 1) {
                     hide.push('restore');
@@ -1258,7 +1266,7 @@ define([
             var filtered = [];
             show.forEach(function (className) {
                 var $el = $contextMenu.find('.cp-app-drive-context-' + className);
-                if (!APP.editable && $el.is('.cp-app-drive-context-editable')) { return; }
+                if ((!APP.editable || !editable) && $el.is('.cp-app-drive-context-editable')) { return; }
                 if (filter($el, className)) { return; }
                 $el.parent('li').show();
                 filtered.push('.cp-app-drive-context-' + className);
@@ -1665,6 +1673,13 @@ define([
             $('.cp-app-drive-element-droppable').removeClass('cp-app-drive-element-droppable');
             var data = ev.dataTransfer.getData("text");
 
+            var newPath = findDropPath(ev.target);
+            if (!newPath) { return; }
+            var sfId = manager.isInSharedFolder(newPath);
+            if (sfId && folders[sfId] && folders[sfId].readOnly) {
+                return void UI.warn(Messages.fm_forbidden);
+            }
+
             // Don't use the normal drop handler for file upload
             var fileDrop = ev.dataTransfer.files;
             if (fileDrop.length) { return void onFileDrop(fileDrop, ev); }
@@ -1682,8 +1697,6 @@ define([
                 }
             });
 
-            var newPath = findDropPath(ev.target);
-            if (!newPath) { return; }
             if (sharedF && manager.isPathIn(newPath, [TRASH])) {
                 return void deletePaths(null, movedPaths);
             }
@@ -1945,7 +1958,8 @@ define([
                 addFileData(element, $element);
             }
             $element.addClass(liClass);
-            addDragAndDropHandlers($element, newPath, isFolder, !isTrash);
+            var droppable = !isTrash && !APP.$content.data('readOnlyFolder');
+            addDragAndDropHandlers($element, newPath, isFolder, droppable);
             $element.click(function(e) {
                 e.stopPropagation();
                 onElementClick(e, $element);
@@ -2786,6 +2800,7 @@ define([
             return $container;
         };
         var createGhostIcon = function ($list) {
+            if (APP.$content.data('readOnlyFolder')) { return; }
             var isInRoot = currentPath[0] === ROOT;
             var $element = $('<li>', {
                 'class': 'cp-app-drive-element-row cp-app-drive-element-grid cp-app-drive-new-ghost'
@@ -3209,6 +3224,7 @@ define([
             if (!APP.editable) { debug("Read-only mode"); }
             if (!appStatus.isReady && !force) { return; }
 
+            // Fix path obvious issues
             if (!path || path.length === 0) {
                 // Only Trash and Root are available in not-owned files manager
                 if (!path || displayedCategories.indexOf(path[0]) === -1) {
@@ -3226,7 +3242,7 @@ define([
                 path = [ROOT];
             }
 
-
+            // Get path data
             appStatus.ready(false);
             currentPath = path;
             var s = $content.scrollTop() || 0;
@@ -3248,6 +3264,7 @@ define([
                 currentPath = path;
             }
 
+            // Make sure the path is valid
             var root = isVirtual ? undefined : manager.find(path);
             if (manager.isSharedFolder(root)) {
                 // ANON_SHARED_FOLDER
@@ -3270,6 +3287,7 @@ define([
             }
             if (!isSearch) { delete APP.Search.oldLocation; }
 
+            // Display the tree and build the content
             APP.resetTree();
             if (displayedCategories.indexOf(SEARCH) !== -1 && $tree.find('#cp-app-drive-tree-search-input').length) {
                 // in history mode we want to focus the version number input
@@ -3302,9 +3320,24 @@ define([
 
             var $list = $('<ul>').appendTo($dirContent);
 
-            // NewButton can be undefined if we're in read only mode
-            createNewButton(isInRoot, $toolbar.find('.cp-app-drive-toolbar-leftside'));
             var sfId = manager.isInSharedFolder(currentPath);
+            var readOnlyFolder = false;
+            if (APP.readOnly) {
+                // Read-only drive (team?)
+                $readOnly.show();
+            } else if (folders[sfId] && folders[sfId].readOnly) {
+                // If readonly shared folder...
+                $readOnly.show();
+                readOnlyFolder = true;
+            } else {
+                $readOnly.hide();
+            }
+            $content.data('readOnlyFolder', readOnlyFolder);
+
+            // NewButton can be undefined if we're in read only mode
+            if (!readOnlyFolder) {
+                createNewButton(isInRoot, $toolbar.find('.cp-app-drive-toolbar-leftside'));
+            }
             if (sfId) {
                 var sfData = manager.getSharedFolderData(sfId);
                 var parsed = Hash.parsePadUrl(sfData.href);
@@ -3314,6 +3347,7 @@ define([
                 sframeChan.event('EV_DRIVE_SET_HASH', '');
             }
 
+
             createTitle($toolbar.find('.cp-app-drive-path'), path);
 
             if (APP.mobile()) {
@@ -3524,6 +3558,7 @@ define([
                 var newPath = path.slice();
                 newPath.push(key);
                 var isSharedFolder = manager.isSharedFolder(root[key]);
+                var sfId = manager.isInSharedFolder(newPath) || (isSharedFolder && root[key]);
                 var $icon, isCurrentFolder, subfolder;
                 if (isSharedFolder) {
                     var fId = root[key];
@@ -3545,13 +3580,19 @@ define([
                         (isCurrentFolder ? $folderOpenedEmptyIcon : $folderEmptyIcon) :
                         (isCurrentFolder ? $folderOpenedIcon : $folderIcon);
                 }
-                var $element = createTreeElement(key, $icon.clone(), newPath, true, true, subfolder, isCurrentFolder, isSharedFolder);
+                var f = folders[sfId];
+                var editable = !(f && f.readOnly);
+                var $element = createTreeElement(key, $icon.clone(), newPath, true, editable,
+                                                subfolder, isCurrentFolder, isSharedFolder);
                 $element.appendTo($list);
                 $element.find('>.cp-app-drive-element-row').contextmenu(openContextMenu('tree'));
                 if (isSharedFolder) {
                     $element.find('>.cp-app-drive-element-row')
                         .addClass('cp-app-drive-element-sharedf');
                 }
+                if (sfId && !editable) {
+                    $element.attr('data-ro', true);
+                }
                 createTree($element, newPath);
             });
         };
diff --git a/www/drive/inner.html b/www/drive/inner.html
index 206744ea3..ce9e5afb4 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -16,6 +16,7 @@
         </div>
         <div id="cp-app-drive-content-container">
             <div id="cp-app-drive-toolbar"></div>
+            <div id="cp-app-drive-connection-state"></div>
             <div id="cp-app-drive-content" tabindex="2"></div>
         </div>
     </div>
diff --git a/www/drive/inner.js b/www/drive/inner.js
index f5416a861..1f53baaf5 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -52,6 +52,7 @@ define([
                 }, waitFor(function (err, newObj) {
                     folders[fId] = folders[fId] || {};
                     copyObjectValue(folders[fId], newObj);
+                    folders[fId].readOnly = !secret.keys.secondaryKey;
                     if (manager && oldIds.indexOf(fId) === -1) {
                         manager.addProxy(fId, { proxy: folders[fId] }, null, secret.keys.secondaryKey);
                     }
@@ -107,6 +108,7 @@ define([
             }));
             SFCommon.create(waitFor(function (c) { common = c; }));
         }).nThen(function (waitFor) {
+            $('#cp-app-drive-connection-state').text(Messages.disconnected);
             var privReady = Util.once(waitFor());
             var metadataMgr = common.getMetadataMgr();
             if (JSON.stringify(metadataMgr.getPrivateData()) !== '{}') {
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 859887c36..adc2b5014 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -63,6 +63,7 @@ define([
                 }, waitFor(function (err, newObj) {
                     folders[fId] = folders[fId] || {};
                     copyObjectValue(folders[fId], newObj);
+                    folders[fId].readOnly = !secret.keys.secondaryKey;
                     if (manager && oldIds.indexOf(fId) === -1) {
                         manager.addProxy(fId, { proxy: folders[fId] }, null, secret.keys.secondaryKey);
                     }
@@ -275,6 +276,7 @@ define([
 
             // Provide secondaryKey
             var teamData = (privateData.teams || {})[id] || {};
+            driveAPP.readOnly = !teamData.secondaryKey;
             var drive = DriveUI.create(common, {
                 proxy: proxy,
                 folders: folders,
@@ -461,6 +463,8 @@ define([
                 h('div#cp-app-drive-tree'),
                 h('div#cp-app-drive-content-container', [
                     h('div#cp-app-drive-toolbar'),
+                    h('div#cp-app-drive-connection-state', {style: "display: none;"}, Messages.disconnected),
+                    h('div#cp-app-drive-edition-state', {style: "display: none;"}, Messages.readonly),
                     h('div#cp-app-drive-content', {tabindex:2})
                 ])
             ])
@@ -915,7 +919,6 @@ define([
     var redrawTeam = function (common) {
         if (!APP.team) { return; }
         var teamId = APP.team;
-        var name = $('.cp-toolbar-title-value').text();
         APP.module.execCommand('LIST_TEAMS', null, function (obj) {
             if (!obj) { return; }
             if (obj.error) { return void console.error(obj.error); }