1 files changed, 5 insertions, 3 deletions

diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 8213c2b..f5dba0f 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -216,40 +216,42 @@ 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:
-      return addr.givenName() + " " + addr.familyName();
+      retval = addr.givenName() + " " + addr.familyName();
       break;
     case FullName:
-      return addr.prefix() + " " + addr.givenName() + " " +
+      retval =addr.prefix() + " " + addr.givenName() + " " +
              addr.additionalName() + " " + addr.familyName() + " " +
              addr.suffix();
       break;
     case ReverseName:
-      return addr.familyName() + ", " + addr.givenName();
+      retval = addr.familyName() + ", " + 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 );
 }