diff --git a/src/mirall/statusdialog.cpp b/src/mirall/statusdialog.cpp
index 2209532259..41fc16a5f7 100644
--- a/src/mirall/statusdialog.cpp
+++ b/src/mirall/statusdialog.cpp
@@ -238,17 +238,11 @@ StatusDialog::StatusDialog( Theme *theme, QWidget *parent) :
   connect(_ButtonClose,  SIGNAL(clicked()), this, SLOT(accept()));
   connect(_ButtonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveFolder()));
 
-  // hide these two for now...
-  _ButtonFetch->setVisible( false );
-  _ButtonPush->setVisible( false );
-
   connect(_ButtonEnable, SIGNAL(clicked()), this, SLOT(slotEnableFolder()));
   connect(_ButtonInfo,   SIGNAL(clicked()), this, SLOT(slotInfoFolder()));
   connect(_ButtonAdd,    SIGNAL(clicked()), this, SLOT(slotAddSync()));
 
   _ButtonRemove->setEnabled(false);
-  _ButtonFetch->setEnabled(false);
-  _ButtonPush->setEnabled(false);
   _ButtonEnable->setEnabled(false);
   _ButtonInfo->setEnabled(false);
   _ButtonAdd->setEnabled(true);
@@ -270,8 +264,6 @@ void StatusDialog::slotFolderActivated( const QModelIndex& indx )
   bool state = indx.isValid();
 
   _ButtonRemove->setEnabled( state );
-  _ButtonFetch->setEnabled( state );
-  _ButtonPush->setEnabled( state );
   _ButtonEnable->setEnabled( state );
   _ButtonInfo->setEnabled( state );
 
@@ -338,9 +330,7 @@ void StatusDialog::buttonsSetEnabled()
 
     _ButtonEnable->setEnabled(isSelected);
     _ButtonRemove->setEnabled(isSelected);
-    _ButtonFetch->setEnabled(isSelected);
     _ButtonInfo->setEnabled(isSelected);
-    _ButtonPush->setEnabled(isSelected);
 }
 
 void StatusDialog::slotUpdateFolderState( Folder *folder )
@@ -416,30 +406,6 @@ void StatusDialog::slotRemoveSelectedFolder()
     slotCheckConnection();
 }
 
-void StatusDialog::slotFetchFolder()
-{
-  QModelIndex selected = _folderList->selectionModel()->currentIndex();
-  if( selected.isValid() ) {
-    QString alias = _model->data( selected, FolderViewDelegate::FolderAliasRole ).toString();
-    qDebug() << "Fetch Folder alias " << alias;
-    if( !alias.isEmpty() ) {
-      emit(fetchFolderAlias( alias ));
-    }
-  }
-}
-
-void StatusDialog::slotPushFolder()
-{
-  QModelIndex selected = _folderList->selectionModel()->currentIndex();
-  if( selected.isValid() ) {
-    QString alias = _model->data( selected, FolderViewDelegate::FolderAliasRole ).toString();
-    qDebug() << "Push Folder alias " << alias;
-    if( !alias.isEmpty() ) {
-      emit(pushFolderAlias( alias ));
-    }
-  }
-}
-
 void StatusDialog::slotEnableFolder()
 {
   QModelIndex selected = _folderList->selectionModel()->currentIndex();
diff --git a/src/mirall/statusdialog.h b/src/mirall/statusdialog.h
index 7842570455..b8d5069a5f 100644
--- a/src/mirall/statusdialog.h
+++ b/src/mirall/statusdialog.h
@@ -72,8 +72,6 @@ public:
 
 signals:
     void removeFolderAlias( const QString& );
-    void fetchFolderAlias( const QString& );
-    void pushFolderAlias( const QString& );
     void enableFolderAlias( const QString&, const bool );
     void infoFolderAlias( const QString& );
     void openFolderAlias( const QString& );
@@ -84,8 +82,6 @@ signals:
 public slots:
     void slotRemoveFolder();
     void slotRemoveSelectedFolder();
-    void slotFetchFolder();
-    void slotPushFolder();
     void slotFolderActivated( const QModelIndex& );
     void slotOpenOC();
     void slotEnableFolder();
diff --git a/src/mirall/statusdialog.ui b/src/mirall/statusdialog.ui
index 2c30e34e15..599308bf14 100644
--- a/src/mirall/statusdialog.ui
+++ b/src/mirall/statusdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>544</width>
-    <height>308</height>
+    <height>313</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -49,23 +49,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="_ButtonFetch">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>Fetch...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="_ButtonPush">
-       <property name="text">
-        <string>Push...</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="_ButtonEnable">
        <property name="text">