1 files changed, 17 insertions, 8 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index e9e6a0b..3fa1a7c 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -559,12 +559,14 @@ void AbTable::loadFile( const QString &strFile, bool journalFile )
     if ( !f.open(IO_ReadOnly) )
         return;
     QList<Contact> list;
     list.setAutoDelete( TRUE );
     QByteArray ba = f.readAll();
     f.close();
+   if (ba.isEmpty() )
+       return;
     char *uc = ba.data();//(QChar *)data.unicode();
     int len = ba.size();//data.length();
     bool foundAction = false;
     Contact::journal_action action;
     bool foundKey = false;
     int journalKey = 0;
@@ -794,23 +796,30 @@ void AbTable::internalAddEntries( QList<Contact> &list )
 
 
 void AbTable::journalFreeReplace( const Contact &cnt, int row )
 {
     QString strName,
         strContact;
-    AbTableItem *ati;
+    AbTableItem *ati = 0l;
 
     strName = findContactName( cnt );
     strContact = findContactContact( cnt );
     ati = static_cast<AbTableItem*>(item(row, 0));
-    contactList.remove( ati );
-    ati->setItem( strName, strContact );
-    contactList.insert( ati, cnt );
-
-    ati = static_cast<AbTableItem*>(item(row, 1));
-    ati->setItem( strContact, strName );
+    if ( ati != 0 ) {
+        contactList.remove( ati );
+        ati->setItem( strName, strContact );
+        contactList.insert( ati, cnt );
+
+        ati = static_cast<AbTableItem*>(item(row, 1));
+        ati->setItem( strContact, strName );
+    }else{
+        int myrows = numRows();
+        setNumRows( myrows + 1 );
+        insertIntoTable( cnt, myrows );
+        // gets deleted when returning
+    }
 }
 
 void AbTable::journalFreeRemove( int row )
 {
     AbTableItem *ati;
     ati = static_cast<AbTableItem*>(item(row, 0));
@@ -1080,13 +1089,13 @@ void AbTable::updateVisible()
             if ( tmpStr != QString(QChar(showChar)) && showChar != '#' ) {
                     hide = true;
             }
             if ( showChar == '#' ) {
                     if (tmpStr == "a")
                             hide = true;
-                    
+
                     if (tmpStr == "b")
                             hide = true;
 
                     if (tmpStr == "c")
                             hide = true;