-#define MODEST_DIR ".modest"
-#define MODEST_CACHE_DIR "cache"
-#define MODEST_LOCAL_FOLDERS_MAILDIR "local_folder"
-
+#define MODEST_DIR ".modest"
+#define MODEST_CACHE_DIR "cache"
+#define MODEST_LOCAL_FOLDERS_ACCOUNT_NAME "local_folders"
+#define MODEST_LOCAL_FOLDERS_ACCOUNT_ID MODEST_LOCAL_FOLDERS_ACCOUNT_NAME
+#define MODEST_LOCAL_FOLDERS_MAILDIR MODEST_LOCAL_FOLDERS_ACCOUNT_NAME