--- a/calendarui/commonutils/src/calenviewutils.cpp	Fri Mar 12 15:42:35 2010 +0200
+++ b/calendarui/commonutils/src/calenviewutils.cpp	Mon Mar 15 12:40:18 2010 +0200
@@ -93,10 +93,19 @@
     const TInt max = aMaxLength;
     TInt freeSpace = max - 2; // freeSpace is recalculated after each update
 
-    const TDesC& summary = aEntry.SummaryL();
-    const TDesC& location = aEntry.LocationL();
+    const TDesC& summary = aEntry.SummaryL();    
+    //const TDesC& location = aEntry.LocationL();    
     const TDesC& westernSeparator = KWesternSummaryLocationSeparator;
     const TDesC& arabicSeparator =  KArabicSummaryLocationSeparator;
+    
+    //location string is not available for anniversary and todo
+    HBufC16* text = HBufC16::NewLC( max );    
+    TPtrC location = text->Des();
+    if ( CCalEntry::ETodo != aEntry.EntryTypeL())
+        {
+            location.Set(aEntry.LocationL());
+        }
+    
 
     if(AknLayoutUtils::LayoutMirrored())
         {
@@ -150,7 +159,7 @@
         freeSpace = max - aTarget.Length();
         CleanupStack::PopAndDestroy(emptytext);
         }
-
+    CleanupStack::PopAndDestroy( text );
     TRACE_EXIT_POINT;
     }