diff --git a/UI/WebServerResources/js/Mailer/message-model.js b/UI/WebServerResources/js/Mailer/message-model.js
index 8f3d1bd69..776f9cdb6 100644
--- a/UI/WebServerResources/js/Mailer/message-model.js
+++ b/UI/WebServerResources/js/Mailer/message-model.js
@@ -40,10 +40,13 @@
       $timeout: $timeout,
       $log: $log,
       $sce: $sce,
-      $$resource: new Resource(Settings.baseURL, Settings.activeUser),
-      $tags: window.UserDefaults.SOGoMailLabelsColors
+      $$resource: new Resource(Settings.activeUser.folderURL + 'Mail', Settings.activeUser)
     });
 
+    if (window.UserDefaults && window.UserDefaults.SOGoMailLabelsColors) {
+      Message.$tags = window.UserDefaults.SOGoMailLabelsColors;
+    }
+
     return Message; // return constructor
   }];