diff --git a/dev/App/User.js b/dev/App/User.js
index f3f83a8f4..64f463513 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -565,7 +565,7 @@ class AppUser extends AbstractApp {
 
 							const folderFromCache = getFolderFromCacheList(data.Result.Folder);
 							if (folderFromCache) {
-								folderFromCache.interval = Date.now() / 1000;
+								folderFromCache.interval = Date.now();
 
 								if (data.Result.Hash) {
 									setFolderHash(data.Result.Folder, data.Result.Hash);
@@ -640,7 +640,7 @@ class AppUser extends AbstractApp {
 			Remote.folderInformationMultiply((sResult, oData) => {
 				if (StorageResultType.Success === sResult) {
 					if (oData && oData.Result && oData.Result.List && Array.isNotEmpty(oData.Result.List)) {
-						const utc = Date.now() / 1000;
+						const utc = Date.now();
 						oData.Result.List.forEach(item => {
 							const hash = getFolderHash(item.Folder),
 								folder = getFolderFromCacheList(item.Folder);
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index 6c55e7945..18caa4e93 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -152,9 +152,9 @@ class FolderUserStore {
 	 */
 	getNextFolderNames() {
 		const result = [],
-			limit = 5,
-			utc = Date.now() / 1000,
-			timeout = utc - 60 * 5,
+			limit = 10,
+			utc = Date.now(),
+			timeout = utc - 60000 * 5,
 			timeouts = [],
 			inboxFolderName = getFolderInboxName(),
 			fSearchFunction = (list) => {
@@ -165,7 +165,9 @@ class FolderUserStore {
 						folder.selectable &&
 						folder.exists &&
 						timeout > folder.interval &&
-						(folder.isSystemFolder() || (folder.subscribed() && folder.checkable()))
+						// https://github.com/the-djmaze/snappymail/issues/47
+//						(folder.isSystemFolder() || (folder.subscribed() && folder.checkable()))
+						(folder.isSystemFolder() || folder.subscribed())
 					) {
 						timeouts.push([folder.interval, folder.fullNameRaw]);
 					}
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 5ff67af31..13df98381 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -683,7 +683,7 @@ class MessageUserStore {
 				folder = getFolderFromCacheList(collection.Folder);
 
 			if (folder && !cached) {
-				folder.interval = Date.now() / 1000;
+				folder.interval = Date.now();
 
 				setFolderHash(collection.Folder, collection.FolderHash);