2 files changed, 12 insertions, 10 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 9230b8b..178559b 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -475,17 +475,18 @@ QString OContact::toRichText() const
 
     if ( !(value = businessStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  businessState();
+    if ( !(value = businessZip()).isEmpty() )
+        text += Qtopia::escapeString(value) + " ";
     if ( !(value = businessCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( state )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if ( !state.isEmpty() )
         text += Qtopia::escapeString(state) + "<br>";
-    if ( !(value = businessZip()).isEmpty() )
-        text += Qtopia::escapeString(value) + "<br>";
+
     if ( !(value = businessCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Business data
@@ -536,17 +537,17 @@ QString OContact::toRichText() const
 
     if ( !(value = homeStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  homeState();
+    if ( !(value = homeZip()).isEmpty() )
+        text += Qtopia::escapeString(value) + " ";
     if ( !(value = homeCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( !state.isEmpty() )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if (!state.isEmpty())
         text += Qtopia::escapeString(state) + "<br>";
-    if ( !(value = homeZip()).isEmpty() )
-        text += Qtopia::escapeString(value) + "<br>";
     if ( !(value = homeCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Home data
@@ -632,9 +633,9 @@ QString OContact::toRichText() const
             text += "<br>";
     }
 
     // notes last
-    if ( (value = notes()) ) {
+    if ( !(value = notes()).isEmpty() ) {
             text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
             QRegExp reg("\n");
 
             //QString tmp = Qtopia::escapeString(value);
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 9230b8b..178559b 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -475,17 +475,18 @@ QString OContact::toRichText() const
 
     if ( !(value = businessStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  businessState();
+    if ( !(value = businessZip()).isEmpty() )
+        text += Qtopia::escapeString(value) + " ";
     if ( !(value = businessCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( state )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if ( !state.isEmpty() )
         text += Qtopia::escapeString(state) + "<br>";
-    if ( !(value = businessZip()).isEmpty() )
-        text += Qtopia::escapeString(value) + "<br>";
+
     if ( !(value = businessCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Business data
@@ -536,17 +537,17 @@ QString OContact::toRichText() const
 
     if ( !(value = homeStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  homeState();
+    if ( !(value = homeZip()).isEmpty() )
+        text += Qtopia::escapeString(value) + " ";
     if ( !(value = homeCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( !state.isEmpty() )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if (!state.isEmpty())
         text += Qtopia::escapeString(state) + "<br>";
-    if ( !(value = homeZip()).isEmpty() )
-        text += Qtopia::escapeString(value) + "<br>";
     if ( !(value = homeCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Home data
@@ -632,9 +633,9 @@ QString OContact::toRichText() const
             text += "<br>";
     }
 
     // notes last
-    if ( (value = notes()) ) {
+    if ( !(value = notes()).isEmpty() ) {
             text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
             QRegExp reg("\n");
 
             //QString tmp = Qtopia::escapeString(value);