--- a/mobilemessaging/unieditor/application/src/UniEditorHeader.cpp	Wed Mar 31 21:25:02 2010 +0300
+++ b/mobilemessaging/unieditor/application/src/UniEditorHeader.cpp	Wed Apr 14 15:53:21 2010 +0300
@@ -56,7 +56,7 @@
 // CONSTANTS
 const TInt KUniCharAt = '@';
 const TInt  KUniMaxSubject  = 40;
-
+const TUint KZeroWidthNonJoiner = 0x200C;
 // MACROS
 
 // LOCAL CONSTANTS AND MACROS
@@ -115,6 +115,18 @@
     iAddDelayed = EUniFeatureTo;
     
     iDoc.DataModel()->AttachmentList().SetListObserver( this );
+    TPtrC cvsubject = iMtm.SubjectL();
+    TUint value = 0;  
+    if( cvsubject.Length() != 0 )
+       {         
+        TLex Cv( cvsubject);
+        Cv.Val( value );
+        if(value == KZeroWidthNonJoiner)
+            {
+            iDoc.SetLaunchFromCvAttachment(ETrue);
+            iMtm.SetSubjectL(KNullDesC());           
+            }
+       }
         
     const TPtrC subject = iMtm.SubjectL();