diff --git a/mailnews/base/prefs/resources/content/am-imap-advanced.xul b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
index 92f3d9853db..8a4000637aa 100644
--- a/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@@ -25,7 +25,14 @@
 <checkbox imap_persist="true" id="dualUseFolders" label="&dualUseFolders.label;"/>
 
 <separator class="groove"/>
+<row>
+  <hbox align="center">
+    <label control="maximumConnectionsNumber" value="&maximumConnectionsNumber.label;"/>
+    <textbox imap_persist="true" size="3" id="maximumConnectionsNumber"/>
+  </hbox>
+</row>
 
+<separator class="groove"/>
 <description>&namespaceDesc.label;</description>
 <grid>
   <columns>
diff --git a/mailnews/base/prefs/resources/content/am-server.js b/mailnews/base/prefs/resources/content/am-server.js
index 48000cd7608..f1dfc3ba6ce 100644
--- a/mailnews/base/prefs/resources/content/am-server.js
+++ b/mailnews/base/prefs/resources/content/am-server.js
@@ -126,6 +126,7 @@ function getImapServer() {
 
     imapServer.usingSubscription = document.getElementById("imap.usingSubscription").checked;
 
+    imapServer.maximumConnectionsNumber = document.getElementById("imap.maximumConnectionsNumber").getAttribute("value");
     // string prefs
     imapServer.personalNamespace = document.getElementById("imap.personalNamespace").getAttribute("value");
     imapServer.publicNamespace = document.getElementById("imap.publicNamespace").getAttribute("value");
@@ -141,6 +142,7 @@ function saveServerLocally(imapServer)
     document.getElementById("imap.dualUseFolders").checked = imapServer.dualUseFolders;
     document.getElementById("imap.usingSubscription").checked = imapServer.usingSubscription;
 
+    document.getElementById("imap.maximumConnectionsNumber").setAttribute("value", imapServer.maximumConnectionsNumber);
     // string prefs
     document.getElementById("imap.personalNamespace").setAttribute("value", imapServer.personalNamespace);
     document.getElementById("imap.publicNamespace").setAttribute("value", imapServer.publicNamespace);
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index 305da4ad513..de1a6db18a1 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -175,6 +175,7 @@ Contributors:
     <checkbox hidden="true" wsm_persist="true" id="imap.usingSubscription"
               prefattribute="value"
               prefstring="mail.server.%serverkey%.using_subscription"/>
+    <label hidden="true" wsm_persist="true" id="imap.maximumConnectionsNumber"/>
     <label hidden="true" wsm_persist="true" id="imap.personalNamespace"/>
     <label hidden="true" wsm_persist="true" id="imap.publicNamespace"/>
     <label hidden="true" wsm_persist="true" id="imap.otherUsersNamespace"/>
diff --git a/mailnews/base/prefs/resources/locale/en-US/am-imap-advanced.dtd b/mailnews/base/prefs/resources/locale/en-US/am-imap-advanced.dtd
index a9e9b34ad37..2675623ce72 100644
--- a/mailnews/base/prefs/resources/locale/en-US/am-imap-advanced.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/am-imap-advanced.dtd
@@ -3,6 +3,7 @@
 <!ENTITY serverDirectory.label "IMAP server directory:">
 <!ENTITY usingSubscription.label "Show only subscribed folders">
 <!ENTITY dualUseFolders.label "Server supports folders that contain sub-folders and messages">
+<!ENTITY maximumConnectionsNumber.label "Maximum number of server connections to cache">
 <!-- LOCALIZATION NOTE (namespaceDesc.label): DONT_TRANSLATE "IMAP" -->
 <!ENTITY namespaceDesc.label "These preferences specify the namespaces on your IMAP server">
 <!ENTITY personalNamespace.label "Personal namespace:">