diff --git a/mailnews/base/public/nsIMsgIncomingServer.idl b/mailnews/base/public/nsIMsgIncomingServer.idl
index c13bd9c89200..a78f2a1718bb 100644
--- a/mailnews/base/public/nsIMsgIncomingServer.idl
+++ b/mailnews/base/public/nsIMsgIncomingServer.idl
@@ -202,6 +202,7 @@ interface nsIMsgIncomingServer : nsISupports {
   attribute boolean loginAtStartUp;
 
   attribute boolean limitMessageSize;
+  attribute boolean limitOfflineMessageSize;
   attribute long maxMessageSize;
 
   attribute nsIMsgRetentionSettings retentionSettings;
diff --git a/mailnews/base/util/nsMsgDBFolder.cpp b/mailnews/base/util/nsMsgDBFolder.cpp
index 6429e59cf0bc..28970e3dfe7a 100644
--- a/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mailnews/base/util/nsMsgDBFolder.cpp
@@ -859,7 +859,7 @@ NS_IMETHODIMP nsMsgDBFolder::ShouldStoreMsgOffline(nsMsgKey msgKey, PRBool *resu
         if (NS_SUCCEEDED(rv) && incomingServer)
         {
           PRBool limitDownloadSize = PR_FALSE;
-          rv = incomingServer->GetLimitMessageSize(&limitDownloadSize);
+          rv = incomingServer->GetLimitOfflineMessageSize(&limitDownloadSize);
           NS_ENSURE_SUCCESS(rv, rv);
           if (limitDownloadSize)
           {
diff --git a/mailnews/base/util/nsMsgIncomingServer.cpp b/mailnews/base/util/nsMsgIncomingServer.cpp
index 3cc14912dcd6..ca25f4e29ad3 100644
--- a/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -1315,4 +1315,8 @@ NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer,
                         LimitMessageSize,
                         "limit_message_size")
 
+NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer,
+      LimitOfflineMessageSize,
+      "limit_offline_message_size")
+
 NS_IMPL_SERVERPREF_INT(nsMsgIncomingServer, MaxMessageSize, "max_size")
diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
index d62c358d6e88..bd8c525b2b19 100644
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -255,6 +255,7 @@ pref("mail.server.default.check_time", 10);
 // "mail.server.default.check_new_mail" now lives in the protocol info
 pref("mail.server.default.dot_fix", true);
 pref("mail.server.default.limit_message_size", false);
+pref("mail.server.default.limit_offline_message_size", true);
 pref("mail.server.default.max_size", 50);
 pref("mail.server.default.auth_login", true);
 pref("mail.server.default.delete_mail_left_on_server", false);
diff --git a/modules/libpref/src/init/mailnews.js b/modules/libpref/src/init/mailnews.js
index d62c358d6e88..bd8c525b2b19 100644
--- a/modules/libpref/src/init/mailnews.js
+++ b/modules/libpref/src/init/mailnews.js
@@ -255,6 +255,7 @@ pref("mail.server.default.check_time", 10);
 // "mail.server.default.check_new_mail" now lives in the protocol info
 pref("mail.server.default.dot_fix", true);
 pref("mail.server.default.limit_message_size", false);
+pref("mail.server.default.limit_offline_message_size", true);
 pref("mail.server.default.max_size", 50);
 pref("mail.server.default.auth_login", true);
 pref("mail.server.default.delete_mail_left_on_server", false);