diff --git a/mailnews/addrbook/src/nsAbCardProperty.cpp b/mailnews/addrbook/src/nsAbCardProperty.cpp
index a020abd49369..fdaf8031fb81 100644
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -530,12 +530,12 @@ NS_IMETHODIMP nsAbCardProperty::SetCardValue(const char *attrname, const PRUnich
       switch (attrname[2]) { 
         case 'e':
           switch (value[0]) {
-            case 'h':
-            case 'H':
+            case 't':    // "true"
+            case 'T':
               rv = SetPreferMailFormat(nsIAbPreferMailFormat::html);
               break;
-            case 'p':
-            case 'P':
+            case 'f':    // "false"
+            case 'F':
               rv = SetPreferMailFormat(nsIAbPreferMailFormat::plaintext);
               break;
             default:
diff --git a/mailnews/addrbook/src/nsAbLDAPProperties.cpp b/mailnews/addrbook/src/nsAbLDAPProperties.cpp
index b61af8562999..f6e896054c56 100644
--- a/mailnews/addrbook/src/nsAbLDAPProperties.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPProperties.cpp
@@ -172,10 +172,6 @@ static MozillaLdapPropertyRelation mozillaLdapPropertyTable[] =
     {MozillaProperty_String, "Notes",        "description"},
 
     // mozilla specfic
-    // use the more self-explanatory named attribute 'xmozillapreferredmailformat' to
-    // the now deprecated 'xmozillausehtmlmail' which sounds like it is a boolean value.
-    // We need to continue to include the 'xmozillausehtmlmail' for existing systems. 
-    {MozillaProperty_Int, "PreferMailFormat",    "xmozillapreferredmailformat"},
     {MozillaProperty_Int, "PreferMailFormat",    "xmozillausehtmlmail"},
     // ?
     {MozillaProperty_Int, "LastModifiedDate",    "modifytimestamp"}