diff --git a/mozilla/mail/app/profile/all-thunderbird.js b/mozilla/mail/app/profile/all-thunderbird.js
index ecadc5bfd90..069cd903848 100644
--- a/mozilla/mail/app/profile/all-thunderbird.js
+++ b/mozilla/mail/app/profile/all-thunderbird.js
@@ -45,10 +45,6 @@ pref("general.skins.selectedSkin", "classic/1.0");
 #ifdef XP_MACOSX
 pref("browser.chromeURL", "chrome://messenger/content/messengercompose/messengercompose.xul");
 pref("mail.biff.animate_dock_icon", false);
-
-pref("ldap_2.servers.osx.uri", "moz-abosxdirectory:///");
-pref("ldap_2.servers.osx.description", "chrome://messenger/locale/addressbook/addressBook.properties");
-pref("ldap_2.servers.osx.dirType", 3);
 #endif
 
 // gtk2 (*nix) lacks transparent/translucent drag support (bug 376238), so we
diff --git a/mozilla/mailnews/mailnews.js b/mozilla/mailnews/mailnews.js
index 5336d823518..c66985f9bf0 100644
--- a/mozilla/mailnews/mailnews.js
+++ b/mozilla/mailnews/mailnews.js
@@ -722,7 +722,17 @@ pref("mailnews.import.text.skipfirstrecord", true);
 // automatically scale attached images that are displayed inline
 pref("mail.enable_automatic_image_resizing", true);
 
+#ifdef MOZ_SUITE
+#ifdef XP_WIN
+pref("ldap_2.servers.oe.uri", "moz-aboutlookdirectory://oe/");
+pref("ldap_2.servers.oe.description", "chrome://messenger/locale/addressbook/addressBook.properties");
+pref("ldap_2.servers.oe.dirType", 3);
+#endif
+#endif
 #ifdef XP_MACOSX
+pref("ldap_2.servers.osx.uri", "moz-abosxdirectory:///");
+pref("ldap_2.servers.osx.description", "chrome://messenger/locale/addressbook/addressBook.properties");
+pref("ldap_2.servers.osx.dirType", 3);
 pref("mail.notification.sound",             "");
 #else
 #ifdef XP_UNIX
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
index 22eb7da2a61..14fc035a95f 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
@@ -115,6 +115,10 @@ addressBook=Address Book
 # mailnews.js
 ldap_2.servers.pab.description=Personal Address Book
 ldap_2.servers.history.description=Collected Addresses
+## LOCALIZATION NOTE (ldap_2.servers.oe.description is only used on Windows)
+ldap_2.servers.oe.description=OE Contacts
+## LOCALIZATION NOTE (ldap_2.servers.osx.description is only used on Mac OS X)
+ldap_2.servers.osx.description=Mac OS X Address Book
 
 # status bar stuff
 ## LOCALIZATION NOTE (totalCardStatus):