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
@@ -355,205 +355,201 @@ OContact::~OContact()
   Returns the business phone number of the contact.
 */
 
 /*! \fn QString OContact::businessFax() const
   Returns the business fax number of the contact.
 */
 
 /*! \fn QString OContact::businessMobile() const
   Returns the business mobile number of the contact.
 */
 
 /*! \fn QString OContact::businessPager() const
   Returns the business pager number of the contact.
 */
 
 /*! \fn QString OContact::businessWebpage() const
   Returns the business webpage of the contact.
 */
 
 /*! \fn QString OContact::spouse() const
   Returns the spouse of the contact.
 */
 
 /*! \fn QString OContact::gender() const
   Returns the gender of the contact.
 */
 
 /*! \fn QString OContact::nickname() const
   Returns the nickname of the contact.
 */
 
 /*! \fn QString OContact::children() const
   Returns the children of the contact.
 */
 
 /*! \fn QString OContact::notes() const
   Returns the notes relating to the the contact.
 */
 
 /*! \fn QString OContact::groups() const
   \internal
   Returns the groups for the contact.
 */
 
 /*! \fn QStringList OContact::groupList() const
   \internal
 */
 
 /*! \fn QString OContact::field(int) const
   \internal
 */
 
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
   \internal
 */
 
 /*! \fn void OContact::setUid( int id )
   \internal
   Sets the uid for this record to \a id.
 */
 
 /*! \enum OContact::journal_action
   \internal
 */
 
 /*!
   \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
     QMap<int, QString> map = mMap;
     QString cats = idsToString( categories() );
     if ( !cats.isEmpty() )
         map.insert( Qtopia::AddressCategory, cats );
     return map;
 }
 
 /*!
   Returns a rich text formatted QString representing the contents the contact.
 */
 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;
     }
 
     if ( !(value = businessStreet()).isEmpty() ){
             text += "<br>" + Qtopia::escapeString(value);
             marker = true;
     }
 
     switch( addressformat ){
     case Zip_City_State:{ //  Zip_Code City, State
             state =  businessState();
             if ( !(value = businessZip()).isEmpty() ){
                     text += "<br>" + Qtopia::escapeString(value) + " ";
                     marker = true;
                     
             }
             if ( !(value = businessCity()).isEmpty() ) {
                     marker = true;
                     if ( businessZip().isEmpty() && !businessStreet().isEmpty() )
                             text += "<br>";
                     text += Qtopia::escapeString(value);
                     if ( state )
                             text += ", " + Qtopia::escapeString(state);
             } else if ( !state.isEmpty() ){
                     text += "<br>" + Qtopia::escapeString(state);
                     marker = true;
             }
             break;
     }
     case City_State_Zip:{ // City, State Zip_Code 
             state =  businessState();
             if ( !(value = businessCity()).isEmpty() ) {
                     marker = true;
                     text += "<br>" + Qtopia::escapeString(value);
                     if ( state )
                             text += ", " + Qtopia::escapeString(state);
             } else if ( !state.isEmpty() ){
                     text += "<br>" + Qtopia::escapeString(state);
                     marker = true;
             }
             if ( !(value = businessZip()).isEmpty() ){
                     text += " " + Qtopia::escapeString(value);
                     marker = true;
             }
             break;
     }
     }
 
     if ( !(value = businessCountry()).isEmpty() ){
         text += "<br>" + Qtopia::escapeString(value);
         marker = true;
     }
 
     // rest of Business data
     str = office();
     if ( !str.isEmpty() ){
         text += "<br><b>" + QObject::tr("Office: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessWebpage();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/webpagework\"> " + QObject::tr("Business Web Page: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessPhone();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/phonework\"> " + QObject::tr("Business Phone: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessFax();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/faxwork\"> " + QObject::tr("Business Fax: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessMobile();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/mobilework\"> " + QObject::tr("Business Mobile: ") + "</b>"
                 + Qtopia::escapeString(str);
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
@@ -355,205 +355,201 @@ OContact::~OContact()
   Returns the business phone number of the contact.
 */
 
 /*! \fn QString OContact::businessFax() const
   Returns the business fax number of the contact.
 */
 
 /*! \fn QString OContact::businessMobile() const
   Returns the business mobile number of the contact.
 */
 
 /*! \fn QString OContact::businessPager() const
   Returns the business pager number of the contact.
 */
 
 /*! \fn QString OContact::businessWebpage() const
   Returns the business webpage of the contact.
 */
 
 /*! \fn QString OContact::spouse() const
   Returns the spouse of the contact.
 */
 
 /*! \fn QString OContact::gender() const
   Returns the gender of the contact.
 */
 
 /*! \fn QString OContact::nickname() const
   Returns the nickname of the contact.
 */
 
 /*! \fn QString OContact::children() const
   Returns the children of the contact.
 */
 
 /*! \fn QString OContact::notes() const
   Returns the notes relating to the the contact.
 */
 
 /*! \fn QString OContact::groups() const
   \internal
   Returns the groups for the contact.
 */
 
 /*! \fn QStringList OContact::groupList() const
   \internal
 */
 
 /*! \fn QString OContact::field(int) const
   \internal
 */
 
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
   \internal
 */
 
 /*! \fn void OContact::setUid( int id )
   \internal
   Sets the uid for this record to \a id.
 */
 
 /*! \enum OContact::journal_action
   \internal
 */
 
 /*!
   \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
     QMap<int, QString> map = mMap;
     QString cats = idsToString( categories() );
     if ( !cats.isEmpty() )
         map.insert( Qtopia::AddressCategory, cats );
     return map;
 }
 
 /*!
   Returns a rich text formatted QString representing the contents the contact.
 */
 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;
     }
 
     if ( !(value = businessStreet()).isEmpty() ){
             text += "<br>" + Qtopia::escapeString(value);
             marker = true;
     }
 
     switch( addressformat ){
     case Zip_City_State:{ //  Zip_Code City, State
             state =  businessState();
             if ( !(value = businessZip()).isEmpty() ){
                     text += "<br>" + Qtopia::escapeString(value) + " ";
                     marker = true;
                     
             }
             if ( !(value = businessCity()).isEmpty() ) {
                     marker = true;
                     if ( businessZip().isEmpty() && !businessStreet().isEmpty() )
                             text += "<br>";
                     text += Qtopia::escapeString(value);
                     if ( state )
                             text += ", " + Qtopia::escapeString(state);
             } else if ( !state.isEmpty() ){
                     text += "<br>" + Qtopia::escapeString(state);
                     marker = true;
             }
             break;
     }
     case City_State_Zip:{ // City, State Zip_Code 
             state =  businessState();
             if ( !(value = businessCity()).isEmpty() ) {
                     marker = true;
                     text += "<br>" + Qtopia::escapeString(value);
                     if ( state )
                             text += ", " + Qtopia::escapeString(state);
             } else if ( !state.isEmpty() ){
                     text += "<br>" + Qtopia::escapeString(state);
                     marker = true;
             }
             if ( !(value = businessZip()).isEmpty() ){
                     text += " " + Qtopia::escapeString(value);
                     marker = true;
             }
             break;
     }
     }
 
     if ( !(value = businessCountry()).isEmpty() ){
         text += "<br>" + Qtopia::escapeString(value);
         marker = true;
     }
 
     // rest of Business data
     str = office();
     if ( !str.isEmpty() ){
         text += "<br><b>" + QObject::tr("Office: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessWebpage();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/webpagework\"> " + QObject::tr("Business Web Page: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessPhone();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/phonework\"> " + QObject::tr("Business Phone: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessFax();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/faxwork\"> " + QObject::tr("Business Fax: ") + "</b>"
                 + Qtopia::escapeString(str);
         marker = true;
     }
     str = businessMobile();
     if ( !str.isEmpty() ){
         text += "<br><b><img src=\"addressbook/mobilework\"> " + QObject::tr("Business Mobile: ") + "</b>"
                 + Qtopia::escapeString(str);