2 files changed, 3 insertions, 0 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 939296f..9b059d3 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -319,12 +319,13 @@ KABCore::~KABCore()
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
   mAddressBook = 0;
   KABC::StdAddressBook::close();
 
   delete syncManager;
+
 }
 
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
@@ -699,12 +700,13 @@ void KABCore::export2phone()
 
       if ( a.isEmpty() )
           continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
+      a.simplifyAddresses();
 
       if (description.isEmpty())
           description = a.formattedName();
       QString vcard;
       QString vcardnew;
       converter.addresseeToVCard( a, vcard );
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 552c933..dded2bf 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -79,12 +79,13 @@ KABPrefs::KABPrefs()
   addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 
 }
 
 KABPrefs::~KABPrefs()
 {
+    //qDebug("KABPrefs::~KABPrefs() ");
 }
 
 KABPrefs *KABPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef KAB_EMBEDDED