1 files changed, 6 insertions, 1 deletions

diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index f5dba0f..199f3d6 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -215,49 +215,54 @@ QString NameEditDialog::customFormattedName() const
 
 int NameEditDialog::formattedNameType() const
 {
   return mFormattedNameCombo->currentItem();
 }
 
 bool NameEditDialog::changed() const
 {
   return mChanged;
 }
 
 QString NameEditDialog::formattedName( const KABC::Addressee &addr, int type )
 {
     QString retval;
   switch ( type ) {
     case SimpleName:
       retval = addr.givenName() + " " + addr.familyName();
       break;
     case FullName:
       retval =addr.prefix() + " " + addr.givenName() + " " +
              addr.additionalName() + " " + addr.familyName() + " " +
              addr.suffix();
       break;
     case ReverseName:
-      retval = addr.familyName() + ", " + addr.givenName();
+        if ( !addr.familyName().isEmpty() ) {
+            retval = addr.familyName();
+            if ( !addr.givenName().isEmpty() )
+                retval += ", " + addr.givenName();
+        } else
+            retval =  addr.givenName();
       break;
     default:
       return "";
       break;
   }
   return retval.stripWhiteSpace ();
 }
 
 void NameEditDialog::parseBoxChanged( bool value )
 {
     //AddresseeConfig::instance()->setUid( addr.uid() );
   AddresseeConfig::instance()->setAutomaticNameParsing( value );
 }
 
 void NameEditDialog::typeChanged( int pos )
 {
   mFormattedNameEdit->setEnabled( pos == 0 );
 }
 
 void NameEditDialog::modified()
 {
   mChanged = true;
 }