--- a/calendarui/views/src/caleneventviewcontainer.cpp	Fri Mar 12 15:42:35 2010 +0200
+++ b/calendarui/views/src/caleneventviewcontainer.cpp	Mon Mar 15 12:40:18 2010 +0200
@@ -680,6 +680,7 @@
         
     iTextEditor->SetFocus(EFalse);    
     iTextEditor->SetRect( Rect() );
+    iTextEditor->SetCursorPosL(0,EFalse);
     iTextEditor->RichText()->Reset();
     
     // Create the scroll bars.
@@ -861,6 +862,11 @@
             {
             // date field
             AddDateFieldL(iEventViewData->StartDateTime());
+            
+            // against the location field in the viewer
+            iTimeFieldLines = 1;
+            // location
+            AddLocationFieldL();
     		
             // Adds empty line
             AddEmptyLineL();
@@ -899,6 +905,13 @@
 				AddDateDateFieldL( startTime, endTime );
 				}
 
+			// Increment the time filed count to 1 so that maps icon is placed
+			// against the location field in the viewer
+                    iTimeFieldLines = 1;
+			
+			// location
+                    AddLocationFieldL();
+            
 		    // extra empty line between primary and secondary information
 		    AddEmptyLineL();