--- a/harvesterplugins/messaging/smsmms/src/cmessagedatahandler.cpp	Tue Jul 06 14:17:22 2010 +0300
+++ b/harvesterplugins/messaging/smsmms/src/cmessagedatahandler.cpp	Wed Aug 18 09:49:49 2010 +0300
@@ -493,8 +493,12 @@
     
 	_LIT(KEllipsis, "...");
 	_LIT(KSpace, " ");
-	TInt excerptLength = KMsgBodyExcerptSymbols + KEllipsis().Length(); 
-
+	//
+#ifdef USE_HIGHLIGHTER	
+	TInt excerptLength = aBodyText.Length() + KEllipsis().Length();
+#else	
+	TInt excerptLength = KMsgBodyExcerptSymbols + KEllipsis().Length();
+#endif	
 	//Not removing commented out code as this may come back into use in near future.
 //	TMsvEntry entry;
 //	TMsvId service = 0;
@@ -541,11 +545,13 @@
 //		excerptPtr.Append(aSubject);
 //		excerptPtr.Append(KSpace);
 //		}
-
-	excerptPtr.Append(aBodyText.Left(KMsgBodyExcerptSymbols));
+#ifdef USE_HIGHLIGHTER
+    excerptPtr.Append(aBodyText);
+#else    
+	excerptPtr.Append(aBodyText.Left(KMsgBodyExcerptSymbols));	
 	if (aBodyText.Length() > KMsgBodyExcerptSymbols)
 		excerptPtr.Append(KEllipsis);
-
+#endif
 //	CleanupStack::PopAndDestroy(folder_str);
 	CleanupStack::PushL(excerpt);
 	return excerpt;