2 files changed, 8 insertions, 16 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 0f05b65..fcf3b26 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -450,3 +450,3 @@ QString OContact::toRichText() const
     if ( !(value = jobTitle()).isEmpty() )
-        text += Qtopia::escapeString(value);
+        text += Qtopia::escapeString(value) + " ";
 
@@ -456,9 +456,5 @@ QString OContact::toRichText() const
         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>";
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
@@ -450,3 +450,3 @@ QString OContact::toRichText() const
     if ( !(value = jobTitle()).isEmpty() )
-        text += Qtopia::escapeString(value);
+        text += Qtopia::escapeString(value) + " ";
 
@@ -456,9 +456,5 @@ QString OContact::toRichText() const
         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>";