--- a/emailuis/nmailui/src/nmviewerheader.cpp	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerheader.cpp	Mon May 03 12:23:15 2010 +0300
@@ -96,6 +96,7 @@
     }
 }
 
+
 /*!
     Reimplementation to do some extra painting
 */
@@ -129,6 +130,7 @@
     setHeaderData();
 }
 
+
 /*!
     Function updates data in already created objects. New message pointer
     comes from viewer view, ownership is not transferred.
@@ -232,8 +234,14 @@
     if (mHeaderBox) {        // Initialize recipient box
         if (!mRecipientsBox){
             mRecipientsBox = new HbTextEdit();
+            HbStyle::setItemName(mRecipientsBox, "recipients");
+            mRecipientsBox->setContextMenuFlags(0);
             mRecipientsBox->setReadOnly(true);
-            mRecipientsBox->setFontSpec(HbFontSpec(HbFontSpec::Secondary));        
+            mRecipientsBox->setFontSpec(HbFontSpec(HbFontSpec::Secondary)); 
+            // Set text wrapping for from/to/cc address fields using text document
+            QTextOption textOption = mRecipientsBox->document()->defaultTextOption();
+            textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+            mRecipientsBox->document()->setDefaultTextOption(textOption);
         }
         connect(mRecipientsBox, SIGNAL(cursorPositionChanged(int, int)),
                 this, SLOT(cursorPositionChanged(int, int)));