1 files changed, 6 insertions, 5 deletions

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
@@ -471,25 +471,26 @@ QString OContact::toRichText() const
 	text += QObject::tr( "<b>Work Address:</b>" );
 	text +=  "<br>";
 	marker = true;
     }
 
     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
     str = office();
     if ( !str.isEmpty() ){
 	text += "<b>" + QObject::tr("Office: ") + "</b>"
 		+ Qtopia::escapeString(str) + "<br>";
@@ -532,25 +533,25 @@ QString OContact::toRichText() const
 	text += "<br>";
 	text += QObject::tr( "<b>Home Address:</b>" );
 	text +=  "<br>";
     }
 
     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
     str = homeWebpage();
     if ( !str.isEmpty() ){
 	text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
 		+ Qtopia::escapeString(str) + "<br>";
@@ -628,17 +629,17 @@ QString OContact::toRichText() const
 
     if ( categoryNames().count() ){
 	    text += "<b>" + QObject::tr( "Category:") + "</b> ";
 	    text += categoryNames().join(", ");
 	    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);
 	    QString tmp = QStyleSheet::convertFromPlainText(value);
 	    //tmp.replace( reg, "<br>" );
 	    text += "<br>" + tmp + "<br>";
     }