diff --git a/mozilla/mailnews/base/ispdata/aol.rdf b/mozilla/mailnews/base/ispdata/aol.rdf
index 1fd872251b3..0d192e16a5e 100644
--- a/mozilla/mailnews/base/ispdata/aol.rdf
+++ b/mozilla/mailnews/base/ispdata/aol.rdf
@@ -1,4 +1,14 @@
 <?xml version="1.0"?>
+
+<!DOCTYPE RDF 
+ [
+  <!ENTITY aol.wizardLongName         "AOL account (For example, jsmith@aol.com)">
+  <!ENTITY aol.emailIDFieldTitle      "Screen Name:">
+  <!ENTITY aol.emailIDDescription     "screen name">
+  <!ENTITY aol.prettyName     "AOL Mail">
+ ]
+>
+
 <RDF:RDF
     xmlns:NC="http://home.netscape.com/NC-rdf#"
     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -10,26 +20,35 @@
         <!-- server info -->
         <NC:incomingServer>
           <NC:nsIMsgIncomingServer>
-            <NC:prettyName>AOL account</NC:prettyName>
+            <NC:prettyName>&aol.prettyName;</NC:prettyName>
             <NC:hostName>imap.mail.aol.com</NC:hostName>
-            <NC:type>imap</NC:type>
+            <NC:type>imap
+            <NC:ServerType-imap>                                                
+              <NC:nsIImapIncomingServer>                                        
+                <NC:deleteModel>2</NC:deleteModel>                              
+              </NC:nsIImapIncomingServer>                                       
+            </NC:ServerType-imap>                                               
+            </NC:type>
             <NC:rememberPassword>false</NC:rememberPassword>
             <NC:redirectorType>aol</NC:redirectorType>
+            <NC:offlineSupportLevel>0</NC:offlineSupportLevel>
             <NC:defaultCopiesAndFoldersPrefsToServer>false</NC:defaultCopiesAndFoldersPrefsToServer>
             <NC:canCreateFoldersOnServer>false</NC:canCreateFoldersOnServer>
+            <NC:canCompactFoldersOnServer>false</NC:canCompactFoldersOnServer>
+            <NC:canUndoDeleteOnServer>false</NC:canUndoDeleteOnServer>
+            <NC:canSearchMessages>false</NC:canSearchMessages>
             <NC:canFileMessagesOnServer>false</NC:canFileMessagesOnServer>
-            <NC:ServerType-imap>
-              <NC:nsIImapIncomingServer>
-                <NC:deleteModel>2</NC:deleteModel>
-              </NC:nsIImapIncomingServer>
-            </NC:ServerType-imap>
+            <NC:canEmptyTrashOnExit>false</NC:canEmptyTrashOnExit>
+            <NC:isSecureServer>false</NC:isSecureServer>
+            <NC:canSearchMessages>false</NC:canSearchMessages>
           </NC:nsIMsgIncomingServer>
         </NC:incomingServer>
 
         <!-- identity defaults -->
         <NC:identity>
           <NC:nsIMsgIdentity>
-            <NC:composeHtml>false</NC:composeHtml>
+            <NC:composeHtml>true</NC:composeHtml>
+            <NC:doFcc>false</NC:doFcc>
           </NC:nsIMsgIdentity>
         </NC:identity>
 
@@ -49,9 +68,15 @@
 
         <NC:wizardSkipPanels>true</NC:wizardSkipPanels>
         <NC:wizardShortName>AOL</NC:wizardShortName>
-        <NC:wizardLongName>America Online</NC:wizardLongName>
+        <NC:wizardLongName>&aol.wizardLongName;</NC:wizardLongName>
         <NC:wizardShow>true</NC:wizardShow>
         <NC:wizardPromote>true</NC:wizardPromote>
+        <NC:emailProviderName>AOL</NC:emailProviderName>
+        <NC:sampleEmail>screenname@aol.com</NC:sampleEmail>
+        <NC:sampleUserName>screenname</NC:sampleUserName>
+        <NC:emailIDDescription>&aol.emailIDDescription;</NC:emailIDDescription>
+        <NC:emailIDFieldTitle>&aol.emailIDFieldTitle;</NC:emailIDFieldTitle>
+        <NC:showServerDetailsOnWizardSummary>false</NC:showServerDetailsOnWizardSummary>
       </NC:nsIMsgAccount>
     </NC:providers>
   </RDF:Description>
diff --git a/mozilla/mailnews/base/ispdata/movemail.rdf b/mozilla/mailnews/base/ispdata/movemail.rdf
new file mode 100644
index 00000000000..b52678cdb20
--- /dev/null
+++ b/mozilla/mailnews/base/ispdata/movemail.rdf
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<RDF:RDF
+    xmlns:NC="http://home.netscape.com/NC-rdf#"
+    xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <RDF:Description about="NC:ispinfo">
+    <NC:providers>
+      <NC:nsIMsgAccount about="domain:">
+
+        <!-- server info -->
+        <NC:incomingServer>
+          <NC:nsIMsgIncomingServer>
+            <NC:prettyName>Movemail</NC:prettyName>
+            <NC:hostName>movemail</NC:hostName>
+            <NC:type>movemail</NC:type>
+          </NC:nsIMsgIncomingServer>
+        </NC:incomingServer>
+
+        <!-- identity defaults -->
+        <NC:identity>
+          <NC:nsIMsgIdentity>
+            <NC:composeHtml>false</NC:composeHtml>
+          </NC:nsIMsgIdentity>
+        </NC:identity>
+ 
+        <!--
+        <NC:smtp>
+          <NC:nsISmtpServer>
+            <NC:hostname>localhost</NC:hostname>
+          </NC:nsISmtpServer>
+        </NC:smtp>
+
+        <NC:smtpCreateNewServer>true</NC:smtpCreateNewServer>
+        <NC:smtpUsePreferredServer>true</NC:smtpUsePreferredServer>
+        -->
+
+        <NC:wizardSkipPanels>true</NC:wizardSkipPanels>
+        <NC:wizardShortName>Movemail</NC:wizardShortName>
+        <NC:wizardLongName>UNIX Movemail</NC:wizardLongName>
+        <NC:wizardPromote>true</NC:wizardPromote>
+        <NC:wizardShow>true</NC:wizardShow>
+        <NC:emailProviderName>Movemail</NC:emailProviderName>
+ 
+        <NC:showServerDetailsOnWizardSummary>false</NC:showServerDetailsOnWizardSummary> 
+      </NC:nsIMsgAccount>
+    </NC:providers>
+  </RDF:Description>
+
+</RDF:RDF>
diff --git a/mozilla/mailnews/base/ispdata/nswebmail.rdf b/mozilla/mailnews/base/ispdata/nswebmail.rdf
new file mode 100644
index 00000000000..d90639aac8f
--- /dev/null
+++ b/mozilla/mailnews/base/ispdata/nswebmail.rdf
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE RDF 
+ [
+  <!ENTITY webmail.wizardLongName         "Netscape Webmail (For example, jsmith@netscape.net)">
+  <!ENTITY webmail.emailIDFieldTitle      "User Name:">
+  <!ENTITY webmail.emailIDDescription     "user name">
+  <!ENTITY webmail.prettyName     "Netscape Webmail">
+ ]
+>
+
+<RDF:RDF
+    xmlns:NC="http://home.netscape.com/NC-rdf#"
+    xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <RDF:Description about="NC:ispinfo">
+    <NC:providers>
+      <NC:nsIMsgAccount about="domain:netscape.net">
+
+        <!-- server info -->
+        <NC:incomingServer>
+          <NC:nsIMsgIncomingServer>
+            <NC:prettyName>&webmail.prettyName;</NC:prettyName>
+            <NC:hostName>imap.mail.netcenter.com</NC:hostName>
+            <NC:type>imap</NC:type>
+            <NC:rememberPassword>false</NC:rememberPassword>
+            <NC:redirectorType>netscape</NC:redirectorType>
+            <NC:offlineSupportLevel>10</NC:offlineSupportLevel>
+            <NC:defaultCopiesAndFoldersPrefsToServer>false</NC:defaultCopiesAndFoldersPrefsToServer>
+            <NC:isSecureServer>false</NC:isSecureServer>
+          </NC:nsIMsgIncomingServer>
+        </NC:incomingServer>
+
+        <!-- identity defaults -->
+        <NC:identity>
+          <NC:nsIMsgIdentity>
+            <NC:composeHtml>true</NC:composeHtml>
+            <NC:doFcc>false</NC:doFcc>
+            <NC:attachSignature>true</NC:attachSignature>
+          </NC:nsIMsgIdentity>
+        </NC:identity>
+
+        <NC:smtp>
+          <NC:nsISmtpServer>
+            <NC:hostname>smtp.netscape.net</NC:hostname>
+            <NC:redirectorType>netscape</NC:redirectorType>
+          </NC:nsISmtpServer>
+        </NC:smtp>
+        
+        <!-- other options... see http://www.mozilla.org/mailnews/?? -->
+
+        <NC:smtpRequiresUsername>true</NC:smtpRequiresUsername>
+        <NC:smtpCreateNewServer>true</NC:smtpCreateNewServer>
+        <NC:smtpUsePreferredServer>true</NC:smtpUsePreferredServer>
+
+        <NC:wizardSkipPanels>true</NC:wizardSkipPanels>
+        <NC:wizardShortName>WebMail</NC:wizardShortName>
+        <NC:wizardLongName>&webmail.wizardLongName;</NC:wizardLongName>
+        <NC:wizardShow>true</NC:wizardShow>
+        <NC:wizardPromote>true</NC:wizardPromote>
+        <NC:emailProviderName>Netscape.com</NC:emailProviderName>
+        <NC:sampleEmail>username@netscape.net</NC:sampleEmail>
+        <NC:sampleUserName>username</NC:sampleUserName>
+        <NC:emailIDDescription>&webmail.emailIDDescription;</NC:emailIDDescription>
+        <NC:emailIDFieldTitle>&webmail.emailIDFieldTitle;</NC:emailIDFieldTitle>
+        <NC:showServerDetailsOnWizardSummary>false</NC:showServerDetailsOnWizardSummary>
+        <NC:signatureFileName>webMailSignature.html</NC:signatureFileName>
+        <NC:useOverlayPanels>true</NC:useOverlayPanels>
+        <NC:createNewAccount>true</NC:createNewAccount>
+      </NC:nsIMsgAccount>
+    </NC:providers>
+  </RDF:Description>
+
+</RDF:RDF>