2 files changed, 5 insertions, 4 deletions

diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 3555dc6..281434e 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -298,5 +298,3 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
     QString command;
-    int ret = PhoneAccess::readFromPhone( fileName );
-    if ( ret != 0 ) {
-        qDebug("Error::command returned %d", ret); 
+    if ( ! PhoneAccess::readFromPhone( fileName )) {
         return false;
@@ -489,4 +487,7 @@ bool PhoneFormat::writeToPhone( Calendar *  calendar)
     vfsave.setLocalTime ( true ); 
+    QString id = calendar->timeZoneId();
+    calendar->setLocalTime();
     if ( ! vfsave.save( calendar, fileName ) )
         return false;
+    calendar->setTimeZoneId( id );
     return PhoneAccess::writeToPhone( fileName );
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index 5fafa1f..8298aa6 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -165,3 +165,3 @@ bool PhoneAccess::readFromPhone( QString fileName)
     while ( (ret = system (  command.latin1())) != 0 ) {
-        qDebug("Error S::command returned %d.", ret); 
+        qDebug("Error reading from phone:Command returned %d", ret); 
         int retval = KMessageBox::warningContinueCancel(0,