--- a/meetingrequest/mricalviewer/src/cesmricalviewercmdhandler.cpp	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mricalviewer/src/cesmricalviewercmdhandler.cpp	Wed Mar 31 21:08:33 2010 +0300
@@ -29,7 +29,7 @@
 
 #include <calsession.h>
 //<cmail>
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "esmricalvieweropcodes.hrh"
 #include "esmricalviewerdefs.hrh"
 //</cmail>
@@ -38,8 +38,6 @@
 /// Unnamed namespace for local definitions
 namespace {
 
-#ifdef _DEBUG
-
 // Panic literal
 _LIT( KESMRIcalViewerCmdHandler, "ESMRIcalViewerCmdHandler" );
 
@@ -54,8 +52,6 @@
     User::Panic( KESMRIcalViewerCmdHandler, aPanic );
     }
 
-#endif // _DEBUG
-
 }  // namespace
 
 // ======== MEMBER FUNCTIONS ========
@@ -315,7 +311,7 @@
             break;
         }
 
-    __ASSERT_DEBUG( iCommand, Panic( EInvalidCommand) );
+    __ASSERT_ALWAYS( iCommand, Panic( EInvalidCommand) );
     iCommand->ExecuteCommandL( *iMessage, *this );
     }