diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index c2a98a753..a9aab1e4f 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -264,6 +264,7 @@ void Application::slotAccountStateChanged(int state)
     switch (state) {
     case AccountState::Connected:
         qDebug() << "Enabling sync scheduler, scheduling all folders";
+#warning FIXME: this should schedule a sync for the folders of the account that connected
         folderMan->setSyncEnabled(true);
         folderMan->slotScheduleAllFolders();
         break;
@@ -302,7 +303,7 @@ void Application::slotUpdateConnectionErrors(int accountState)
         _startupNetworkError = accountState == AccountState::NetworkError;
     }
 
-#warning FIXME
+#warning FIXME: connection errors should be shown per account
 #if 0
     AccountState *as = AccountStateManager::instance()->accountState();
     if (as) {
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 3572b405a..b4e476f59 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -345,7 +345,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
         targetPath.remove(0,1);
     }
 
-#warning fixme
+#warning fixme: which account does this folder use?
     AccountState* accountState = AccountManager::instance()->accounts().value(0).data();
     if (!accountState) {
         qWarning() << "can't create folder without an account";
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 0fa41f584..e5f3961e4 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -213,7 +213,7 @@ void ownCloudGui::setConnectionErrors( bool /*connected*/, const QStringList& fa
 
 void ownCloudGui::slotComputeOverallSyncStatus()
 {
-#warning FIXME
+#warning FIXME: overall status needs to look at all accounts
     if (AccountState *a = AccountManager::instance()->accounts().value(0).data()) {
         if (a->isSignedOut()) {
             _tray->setIcon(Theme::instance()->folderOfflineIcon(true));