--- a/pimappservices/calendar/shared/src/agmentry.cpp	Tue Aug 31 15:13:43 2010 +0300
+++ b/pimappservices/calendar/shared/src/agmentry.cpp	Wed Sep 01 12:32:31 2010 +0100
@@ -35,7 +35,7 @@
 
 EXPORT_C CAgnEntry* CAgnEntry::NewL(CCalEntry::TType aType)
 	{
-	__ASSERT_ALWAYS(aType>=CCalEntry::EAppt && aType<=CCalEntry::ENote, Panic(EAgmErrBadTypeEntry));
+	__ASSERT_ALWAYS(aType>=CCalEntry::EAppt && aType<=CCalEntry::EAnniv, Panic(EAgmErrBadTypeEntry));
 	// allocate a CAgnEntry object, which invokes the CAgnSimpleEntry new operator, but passing no allocator
 	// this makes the CAgnSimpleEntry new operator use the default new operator
 	
@@ -52,8 +52,7 @@
 	
 	__ASSERT_ALWAYS(type==CCalEntry::EAppt || type==CCalEntry::EEvent ||
 					type==CCalEntry::EAnniv || type==CCalEntry::ETodo ||
-					type==CCalEntry::EReminder || type == CCalEntry::ENote,
-					User::Leave(KErrCorrupt));
+					type==CCalEntry::EReminder, User::Leave(KErrCorrupt));
 
 	CAgnEntry* entry = CAgnEntry::NewL(type);
 	CleanupStack::PushL(entry);
@@ -238,9 +237,9 @@
 		
 	// Compare the user integer.
 	if (UserInt() != aEntry.UserInt())
-		{
-		return EFalse;
-		}	
+	    {
+	    return EFalse;
+	    }	
 	
 	if ( DTStampUtcL() != aEntry.DTStampUtcL() )
 		{
@@ -686,7 +685,7 @@
 			}
 		}
 
-	// Set the user integer of the stream.
+    // Set the user integer of the stream.
 	aStream.WriteInt32L( UserInt() );
 	
 	// future DC proofing
@@ -1855,9 +1854,9 @@
 @internalComponent
 */
 EXPORT_C void CAgnEntry::SetUserInt( TUint32 aUserInt )
-	{
-	CAgnSimpleEntry::SetUserInt(aUserInt);
-	}
+    {
+    CAgnSimpleEntry::SetUserInt(aUserInt);
+    }
 
 /**
 Gets the user integer of this entry.
@@ -1866,9 +1865,9 @@
 @internalComponent
 */
 EXPORT_C TUint32 CAgnEntry::UserInt() const
-	{
-	return CAgnSimpleEntry::UserInt();
-	}
+    {
+    return CAgnSimpleEntry::UserInt();
+    }
 
 EXPORT_C void CAgnEntry::ExternalizeToBufferL(RWriteStream& aWriteStream) const
 /** Used for passing the data to the between client and server
@@ -2010,18 +2009,6 @@
 // verify entry is valid before storing it
 EXPORT_C void CAgnEntry::VerifyBeforeStoreL()
 	{
-	// check for entry type note
-	if( Type() == CCalEntry::ENote  && !StartTime().IsSet())
-		{
-		// read the modfication time from simple entry
-		TAgnCalendarTime agnStartTime;
-		agnStartTime.SetUtcL(CAgnSimpleEntry::LastModifiedDateUtc());
-
-		TAgnCalendarTime agnEndTime = agnStartTime;
-		// set the modification time as start and end time
-		CAgnSimpleEntry::SetStartAndEndTimeL(agnStartTime, agnEndTime);
-		}
-
 	//Check entry time
 	if ( Type() != CCalEntry::ETodo )
 		{