1 files changed, 12 insertions, 4 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index ff05f7e..16927e2 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -423,53 +423,61 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
     KABC::VCardTool tool;
     list =  tool.parseVCards( data );
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         (*it).setResource( 0 );
         if ( replaceLabel )
             (*it).removeVoice();
         if ( removeOld )
             (*it).setTagged( true );
         insertAddressee( (*it), false, true );
     }
     if ( removeOld )
         removeUntagged();
 }
 void AddressBook::setUntagged()
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         (*ait).setTagged( false );
     }
 }
 void AddressBook::removeUntagged()
 {
   Iterator ait;
+  bool todelete = false;
+  Iterator todel;
   for ( ait = begin(); ait != end(); ++ait ) {
-      if (!(*ait).tagged())
-          removeAddressee( ait );
-  }
- 
+      if ( todelete )
+          removeAddressee( todel );
+      if (!(*ait).tagged()) {
+          todelete = true;
+          todel = ait;
+      } else
+          todelete = false;
+  } 
+  if ( todelete )
+      removeAddressee( todel );
   deleteRemovedAddressees();
 }
 bool AddressBook::saveAB()
 {
   bool ok = true;
 
   deleteRemovedAddressees();
   Iterator ait;
   for ( ait = begin(); ait != end(); ++ait ) {
       if ( !(*ait).IDStr().isEmpty() ) {
           (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
     }
   }
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = d->mManager;
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = requestSaveTicket( *it );
 //        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         error( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }