1 files changed, 4 insertions, 8 deletions

diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 0f05b65..fcf3b26 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -435,45 +435,41 @@ QMap<int, QString> OContact::toMap() const
 QString OContact::toRichText() const
 {
     QString text;
     QString value, comp, state;
     QString str;
     bool marker = false;
 
     Config cfg("qpe");
     cfg.setGroup("Appearance");
     int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State );
 
     // name, jobtitle and company
     if ( !(value = fullName()).isEmpty() )
 	text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>";
     
     if ( !(value = jobTitle()).isEmpty() )
-	text += Qtopia::escapeString(value);
+	text += Qtopia::escapeString(value) + " ";
 
     comp = company();
     if ( !(value = department()).isEmpty() ) {
 	text += Qtopia::escapeString(value);
 	if ( comp )
-	    text += ", ";
-	else
-	    text += "<br>";
-    }
-    if ( !comp.isEmpty() )
-	text += Qtopia::escapeString(comp);
-
+		text += ", " + Qtopia::escapeString(comp);
+    }else if ( comp )
+	    text += "<br>" + Qtopia::escapeString(comp);
     text += "<br><hr>";
 
     // defailt email
     QString defEmail = defaultEmail();
     if ( !defEmail.isEmpty() ){
 	text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>"
 		+ Qtopia::escapeString(defEmail);
 	marker = true;
     }
 
     // business address
     if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
 	 !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
 	text += QObject::tr( "<br><b>Work Address:</b>" );
 	marker = true;
     }