From f705c56cb33efbd5ed9ee6fe1744dfa224351ff2 Mon Sep 17 00:00:00 2001
From: Christian Kamm <mail@ckamm.de>
Date: Wed, 20 Jan 2016 12:41:52 +0100
Subject: [PATCH] AccountSettings: Auto-expand only single folders #4283

---
 src/gui/accountsettings.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index fe467ebc83..837c0d05f1 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -695,7 +695,11 @@ bool AccountSettings::event(QEvent* e)
         _quotaInfo.setActive(isVisible());
     }
     if (e->type() == QEvent::Show) {
-        ui->_folderList->setExpanded(_model->index(0, 0), true);
+        // Expand the folder automatically only if there's only one, see #4283
+        // The 2 is 1 folder + 1 'add folder' button
+        if (_model->rowCount() <= 2) {
+            ui->_folderList->setExpanded(_model->index(0, 0), true);
+        }
     }
     return QWidget::event(e);
 }