2 files changed, 12 insertions, 4 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index efa2777..6aec62e 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -499,15 +499,19 @@ QString OContact::toRichText() const
         text += Qtopia::escapeString(value) + "<br>";
     if ( !(value = homeCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // the others...
     QString str;
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
     str = emails();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Email Addresses: ") + "</b>"
+    if ( !str.isEmpty() && ( str != defEmail ) )
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = homePhone();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = homeFax();
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index efa2777..6aec62e 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -499,15 +499,19 @@ QString OContact::toRichText() const
         text += Qtopia::escapeString(value) + "<br>";
     if ( !(value = homeCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // the others...
     QString str;
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
     str = emails();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Email Addresses: ") + "</b>"
+    if ( !str.isEmpty() && ( str != defEmail ) )
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = homePhone();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = homeFax();