diff --git a/kmailicalifaceimpl.cpp b/kmailicalifaceimpl.cpp
index 2fc44c638..ee0dc4619 100644
--- a/kmailicalifaceimpl.cpp
+++ b/kmailicalifaceimpl.cpp
@@ -633,8 +633,10 @@ Q_UINT32 KMailICalIfaceImpl::update( const QString& resource,
   KMFolder* f = findResourceFolder( resource );
   kdDebug(5006) << "Updating in folder " << f << endl;
   if( f && storageFormat( f ) == StorageXML ){
-    KMMessage* msg;
-    if( sernum != 0 && ( msg = findMessageBySerNum( sernum, f ) ) ) {
+    KMMessage* msg = 0;
+    if ( sernum != 0 )
+      msg = findMessageBySerNum( sernum, f );
+    if ( msg ) {
       // Message found - update it:
 
       // Delete some attachments according to list