--- a/emailuis/emailui/src/ncsaddressinputfield.cpp	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/emailui/src/ncsaddressinputfield.cpp	Thu Jan 07 12:38:38 2010 +0200
@@ -95,11 +95,12 @@
 	// Create label
 	//Load the label string
 	HBufC* aTextBuf = StringLoader::LoadLC( aLabelTextId );
-	//<cmail>
-	CreateControlsL( aTextBuf ? aTextBuf->Des() : TPtrC() );
-	//</cmail>
+
+	TPtrC captionText = aTextBuf ? aTextBuf->Des() : TPtrC();
+	CreateControlsL( captionText );
 	
-	iTextEditor = new ( ELeave ) CNcsAifEditor( iSizeObserver );
+	iTextEditor = new ( ELeave ) CNcsAifEditor( iSizeObserver,
+                                                captionText );
     // iTextEditor is not completely constructed until in SetContainerWindowL()
 
 	iTextEditor->SetPopupList(iAddressPopupList);