3 files changed, 14 insertions, 11 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index e11cf4c..3255269 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -531,3 +531,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
   cnt.setLastName( ln );
-  cnt.setEmails( email );
+  cnt.insertEmails( email );
   cnt.setDefaultEmail( email );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 39bd63c..ae86ed0 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -113,3 +113,3 @@ void ContactEditor::init() {
 			}
-			
+
 			if ( (*it) == tr( "Home Fax" ) ) {
@@ -193,3 +193,3 @@ void ContactEditor::init() {
 			}
-			
+
 			if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" )
@@ -272,3 +272,3 @@ void ContactEditor::init() {
 				continue;
-			} 
+			}
 
@@ -1036,3 +1036,3 @@ void ContactEditor::slotName() {
 	if ( dlgName->exec() ) {
-		
+
 		tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text();
@@ -1419,3 +1419,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
 		if ( *it == tr("Emails" ))
-			*itV = ent.emails();
+			*itV = ent.emailList().join(";");
 
@@ -1620,3 +1620,3 @@ void ContactEditor::saveEntry() {
 			ent.setDefaultEmail(  defaultmail );
-			ent.setEmails( *itV );
+			ent.insertEmails( *itV );
 		}
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h
index 39e00d1..7539df1 100644
--- a/core/pim/todo/todotable.h
+++ b/core/pim/todo/todotable.h
@@ -73,3 +73,3 @@ class TodoTextItem : public QTableItem
 public:
-    TodoTextItem( QTable *t, const QString & str ) 
+    TodoTextItem( QTable *t, const QString & str )
 	:QTableItem( t, QTableItem::Never, str ) {}
@@ -194,4 +194,7 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
 {
-    QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') 
-			      + todo->priority() ) 
+    int rows = numRows();
+    ++rows;
+    setNumRows( rows );
+    QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A')
+			      + todo->priority() )
 		      + Qtopia::buildSortKey( todo->description() );
@@ -207,3 +210,3 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
     setItem( row, 3, due);
-    
+
     setItem( row, 0, chk );