diff --git a/src/gui/sharedialog.h b/src/gui/sharedialog.h
index 742b39e43..ea0d45bb2 100644
--- a/src/gui/sharedialog.h
+++ b/src/gui/sharedialog.h
@@ -61,6 +61,7 @@ private:
     void showSharingUi();
 
     Ui::ShareDialog *_ui;
+
     QPointer<AccountState> _accountState;
     QString _sharePath;
     QString _localPath;
diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 94694ff23..6e8a0a5ec 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -31,25 +31,7 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0">
-   <property name="spacing">
-    <number>10</number>
-   </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
-   </property>
-   <property name="leftMargin">
-    <number>10</number>
-   </property>
-   <property name="topMargin">
-    <number>10</number>
-   </property>
-   <property name="rightMargin">
-    <number>10</number>
-   </property>
-   <property name="bottomMargin">
-    <number>10</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0" columnstretch="0,1" columnminimumwidth="0,0">
      <property name="sizeConstraint">
@@ -171,6 +153,97 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>360</width>
+       <height>45</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>false</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>340</width>
+        <height>45</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>340</width>
+        <height>45</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 6b4582c71..5f1b393ff 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -34,7 +34,6 @@
 #include <QFileInfo>
 #include <QAbstractProxyModel>
 #include <QCompleter>
-#include <qscrollarea.h>
 #include <qlayout.h>
 #include <QPropertyAnimation>
 #include <QMenu>
@@ -44,6 +43,7 @@
 #include <QCryptographicHash>
 #include <QColor>
 #include <QPainter>
+#include <QListWidget>
 
 namespace OCC {
 
@@ -113,16 +113,10 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,
 
     // adds permissions
     QMenu *menu = new QMenu(this);
-    QAction *canShare = new QAction(tr("can share"));
-    canShare->setCheckable(true);
-    canShare->setEnabled(true);
-    canShare->setData(QVariant(SharePermissionShare));
     QAction *canEdit = new QAction(tr("can edit"));
     canEdit->setCheckable(true);
     canEdit->setEnabled(true);
     canEdit->setData(QVariant(SharePermissionUpdate));
-
-    menu->addAction(canShare);
     menu->addAction(canEdit);
     /*
      * Files can't have create or delete permissions
@@ -139,9 +133,12 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,
         menu->addAction(canCreate);
         menu->addAction(canDelete);
     }
-    _ui->permissionToolButton->setDefaultAction(canShare);
+
+    //_ui->permissionToolButton->setDefaultAction(canEdit);
     _ui->permissionToolButton->setMenu(menu);
     _ui->permissionToolButton->setPopupMode(QToolButton::InstantPopup);
+
+    _parentScrollArea = parentWidget()->findChild<QScrollArea*>("scrollArea");
 }
 
 ShareUserGroupWidget::~ShareUserGroupWidget()
@@ -200,7 +197,7 @@ void ShareUserGroupWidget::searchForSharees()
     QSharedPointer<Sharee> currentUser(new Sharee(_account->credentials()->user(), "", Sharee::Type::User));
     blacklist << currentUser;
 
-    foreach (auto sw, _ui->scrollArea->findChildren<ShareUserLine *>()) {
+    foreach (auto sw, _parentScrollArea->findChildren<ShareUserLine *>()) {
         blacklist << sw->share()->getShareWith();
     }
     _ui->errorLabel->hide();
@@ -215,7 +212,7 @@ void ShareUserGroupWidget::getShares()
 void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shares)
 {
     //if(shares.size() > 0){
-        QScrollArea *scrollArea = _ui->scrollArea;
+        QScrollArea *scrollArea = _parentScrollArea;
 
         auto newViewPort = new QWidget(scrollArea);
         auto layout = new QVBoxLayout(newViewPort);
@@ -228,7 +225,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
                 continue;
             }
 
-            ShareUserLine *s = new ShareUserLine(share, _maxSharingPermissions, _isFile, _ui->scrollArea);
+            ShareUserLine *s = new ShareUserLine(share, _maxSharingPermissions, _isFile, _parentScrollArea);
             connect(s, &ShareUserLine::resizeRequested, this, &ShareUserGroupWidget::slotAdjustScrollWidgetSize);
             connect(s, &ShareUserLine::visualDeletionDone, this, &ShareUserGroupWidget::getShares);
             s->setBackgroundRole(layout->count() % 2 == 0 ? QPalette::Base : QPalette::AlternateBase);
@@ -243,10 +240,10 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
         }
 
         if (!layout->isEmpty()) {
-            _ui->scrollArea->setVisible(true);
+            _parentScrollArea->setVisible(true);
             layout->addStretch(1);
         } else {
-            _ui->scrollArea->setVisible(false);
+            _parentScrollArea->setVisible(false);
         }
 
         minimumSize.rwidth() += layout->spacing();
@@ -264,7 +261,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
 
 void ShareUserGroupWidget::slotAdjustScrollWidgetSize()
 {
-    QScrollArea *scrollArea = _ui->scrollArea;
+    QScrollArea *scrollArea = _parentScrollArea;
     if (scrollArea->findChildren<ShareUserLine *>().count() <= 3 &&
             scrollArea->findChildren<ShareUserLine *>().count() > 0) {
         auto minimumSize = scrollArea->widget()->sizeHint();
@@ -308,14 +305,14 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex &index)
     // model proxying the _completerModel
     auto sharee = qvariant_cast<QSharedPointer<Sharee>>(index.data(Qt::UserRole));
     if (sharee.isNull()) {
-        _ui->scrollArea->setVisible(false);
+        _parentScrollArea->setVisible(false);
         return;
     }
 
     /*
      * Add spinner to the bottom of the widget list
      */
-    auto viewPort = _ui->scrollArea->widget();
+    auto viewPort = _parentScrollArea->widget();
     auto layout = qobject_cast<QVBoxLayout *>(viewPort->layout());
 //    auto indicator = new QProgressIndicator(viewPort);
 //    indicator->startAnimation();
@@ -353,9 +350,9 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex &index)
     _ui->shareeLineEdit->setText(QString());
 
     if(layout->isEmpty())
-        _ui->scrollArea->setVisible(false);
+        _parentScrollArea->setVisible(false);
     else
-        _ui->scrollArea->setVisible(true);
+        _parentScrollArea->setVisible(true);
 }
 
 void ShareUserGroupWidget::slotCompleterHighlighted(const QModelIndex &index)
@@ -370,7 +367,7 @@ void ShareUserGroupWidget::displayError(int code, const QString &message)
     _pi_sharee.stopAnimation();
 
     // Also remove the spinner in the widget list, if any
-    foreach (auto pi, _ui->scrollArea->findChildren<QProgressIndicator *>()) {
+    foreach (auto pi, _parentScrollArea->findChildren<QProgressIndicator *>()) {
         delete pi;
     }
 
@@ -409,10 +406,19 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
 {
     _ui->setupUi(this);
 
-    _ui->sharedWith->setText(share->getShareWith()->format());
+    QString sharedWithText(share->getShareWith()->format());
+    QFontMetrics metrics(_ui->sharedWith->font());
+    QString elidedText = metrics.elidedText(sharedWithText, Qt::ElideRight, _ui->sharedWith->width());
+    _ui->sharedWith->setText(elidedText);
 
     // Create detailed permissions menu
     QMenu *menu = new QMenu(this);
+    _permissionShare = new QAction(tr("share"));
+    _permissionShare->setCheckable(true);
+    _permissionShare->setEnabled(true);
+    _permissionShare->setData(QVariant(SharePermissionShare));
+    menu->addAction(_permissionShare);
+
     _permissionCreate = new QAction(tr("create"), this);
     _permissionCreate->setCheckable(true);
     _permissionCreate->setEnabled(maxSharingPermissions & SharePermissionCreate);
@@ -445,14 +451,14 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
     // Set the permissions checkboxes
     displayPermissions();
 
-    _ui->permissionShare->setEnabled(maxSharingPermissions & SharePermissionShare);
+    _permissionShare->setEnabled(maxSharingPermissions & SharePermissionShare);
     _ui->permissionsEdit->setEnabled(maxSharingPermissions
         & (SharePermissionCreate | SharePermissionUpdate | SharePermissionDelete));
 
     connect(_permissionUpdate, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged);
     connect(_permissionCreate, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged);
     connect(_permissionDelete, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged);
-    connect(_ui->permissionShare, &QAbstractButton::clicked, this, &ShareUserLine::slotPermissionsChanged);
+    connect(_permissionShare, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged);
     connect(_ui->permissionsEdit, &QAbstractButton::clicked, this, &ShareUserLine::slotEditPermissionsChanged);
 
     /*
@@ -462,7 +468,7 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
      */
     if (share->getShareType() == Share::TypeRemote
         && share->account()->serverVersionInt() < Account::makeServerVersion(9, 1, 0)) {
-        _ui->permissionShare->setVisible(false);
+        _permissionShare->setVisible(false);
         _ui->permissionToolButton->setVisible(false);
     }
 
@@ -473,7 +479,7 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
         QIcon(QLatin1String(":/client/resources/delete.png"))));
 
     if (!share->account()->capabilities().shareResharing()) {
-        _ui->permissionShare->hide();
+        _permissionShare->setVisible(false);
     }
 
     loadAvatar();
@@ -560,7 +566,7 @@ void ShareUserLine::slotEditPermissionsChanged()
 
     Share::Permissions permissions = SharePermissionRead;
 
-    if (_ui->permissionShare->checkState() == Qt::Checked) {
+    if (_permissionShare->isChecked()) {
         permissions |= SharePermissionShare;
     }
 
@@ -600,7 +606,7 @@ void ShareUserLine::slotPermissionsChanged()
         permissions |= SharePermissionDelete;
     }
 
-    if (_ui->permissionShare->checkState() == Qt::Checked) {
+    if (_permissionShare->isChecked()) {
         permissions |= SharePermissionShare;
     }
 
@@ -672,9 +678,9 @@ void ShareUserLine::displayPermissions()
         _ui->permissionsEdit->setCheckState(Qt::Unchecked);
     }
 
-    _ui->permissionShare->setCheckState(Qt::Unchecked);
+    _permissionShare->setChecked(Qt::Unchecked);
     if (_share->getPermissions() & SharePermissionShare) {
-        _ui->permissionShare->setCheckState(Qt::Checked);
+        _permissionShare->setChecked(Qt::Checked);;
     }
 }
 }
diff --git a/src/gui/shareusergroupwidget.h b/src/gui/shareusergroupwidget.h
index 68d0f47df..6fe55ee53 100644
--- a/src/gui/shareusergroupwidget.h
+++ b/src/gui/shareusergroupwidget.h
@@ -24,6 +24,7 @@
 #include <QList>
 #include <QVector>
 #include <QTimer>
+#include <qscrollarea.h>
 
 class QAction;
 class QCompleter;
@@ -88,6 +89,7 @@ private slots:
 
 private:
     Ui::ShareUserGroupWidget *_ui;
+    QScrollArea *_parentScrollArea;
     AccountPtr _account;
     QString _sharePath;
     QString _localPath;
@@ -144,6 +146,7 @@ private:
     QSharedPointer<Share> _share;
     bool _isFile;
 
+    QAction *_permissionShare;
     QAction *_permissionCreate;
     QAction *_permissionUpdate;
     QAction *_permissionDelete;
diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui
index dbf65d291..bf3cc2af3 100644
--- a/src/gui/shareusergroupwidget.ui
+++ b/src/gui/shareusergroupwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>350</width>
-    <height>120</height>
+    <height>56</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>350</width>
-    <height>120</height>
+    <height>54</height>
    </size>
   </property>
   <property name="maximumSize">
@@ -31,7 +31,7 @@
   <property name="windowTitle">
    <string>Share NewDocument.odt</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
    <property name="spacing">
     <number>0</number>
    </property>
@@ -205,97 +205,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>350</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAsNeeded</enum>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContents</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>false</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>340</width>
-        <height>45</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>340</width>
-        <height>45</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="sizeConstraint">
-        <enum>QLayout::SetFixedSize</enum>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-      </layout>
-     </widget>
-    </widget>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui
index 1d82f0cba..7580882ad 100644
--- a/src/gui/shareuserline.ui
+++ b/src/gui/shareuserline.ui
@@ -9,20 +9,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>330</width>
-    <height>40</height>
+    <width>340</width>
+    <height>45</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
-    <width>330</width>
-    <height>40</height>
+    <width>340</width>
+    <height>45</height>
    </size>
   </property>
   <property name="maximumSize">
@@ -37,7 +37,7 @@
   <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,0,0,0,0">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,3,2,2,2">
    <property name="spacing">
     <number>3</number>
    </property>
@@ -84,19 +84,25 @@
    <item>
     <widget class="QLabel" name="sharedWith">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="text">
-      <string/>
+      <string>User name</string>
      </property>
      <property name="textFormat">
       <enum>Qt::PlainText</enum>
      </property>
      <property name="wordWrap">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -106,7 +112,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::Maximum</enum>
+      <enum>QSizePolicy::Expanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -116,25 +122,6 @@
      </property>
     </spacer>
    </item>
-   <item>
-    <widget class="QCheckBox" name="permissionShare">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>can share</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QCheckBox" name="permissionsEdit">
      <property name="sizePolicy">