diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js
index 313757b..e1011d5 100644
--- a/src/js/controller/mail-list.js
+++ b/src/js/controller/mail-list.js
@@ -347,6 +347,10 @@ var MailListCtrl = function($scope, $routeParams) {
     //
 
     function openCurrentFolder() {
+        if (!currentFolder()) {
+            return;
+        }
+
         emailDao.openFolder({
             folder: currentFolder()
         }, function(error) {
diff --git a/src/js/controller/navigation.js b/src/js/controller/navigation.js
index ddab43b..1ec4080 100644
--- a/src/js/controller/navigation.js
+++ b/src/js/controller/navigation.js
@@ -120,7 +120,6 @@ var NavigationCtrl = function($scope, $routeParams, $location) {
         outboxBo.onSent = sentNotification;
         // start checking outbox periodically
         outboxBo.startChecking($scope.onOutboxUpdate);
-
     }
 
     function sentNotification(email) {