diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index fd83494..a3459e9 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -723,7 +723,7 @@ camel_pop3_delete_old (CamelFolder *folder,
 	gint i;
 	CamelPOP3Store *pop3_store;
 	CamelMimeMessage *message;
-	time_t temp, message_time = 0;
+	time_t temp, message_time;
 
 	parent_store = camel_folder_get_parent_store (folder);
 
@@ -733,6 +733,7 @@ camel_pop3_delete_old (CamelFolder *folder,
 
 	d(printf("%s(%d): pop3_folder->uids->len=[%d]\n", __FILE__, __LINE__, pop3_folder->uids->len));
 	for (i = 0; i < pop3_folder->uids->len; i++) {
+		message_time = 0;
 		fi = pop3_folder->uids->pdata[i];
 
 		d(printf("%s(%d): fi->uid=[%s]\n", __FILE__, __LINE__, fi->uid));
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 6cf38e7..8ca850f 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -586,9 +586,9 @@ pop3_store_connect_sync (CamelService *service,
 			store->cache = camel_data_cache_new (root, error);
 			g_free (root);
 			if (store->cache) {
-				/* Default cache expiry - 1 week or not visited in a day */
-				camel_data_cache_set_expire_age (store->cache, 60*60*24*7);
-				camel_data_cache_set_expire_access (store->cache, 60*60*24);
+				/* Ensure cache will never expire, otherwise it causes redownload of messages */
+				camel_data_cache_set_expire_age (store->cache, -1);
+				camel_data_cache_set_expire_access (store->cache, -1);
 			}
 		}
 	}
