--- a/emailuis/nmailui/conf/nmeditorview.docml	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/conf/nmeditorview.docml	Fri Sep 03 14:07:42 2010 +0300
@@ -2,7 +2,7 @@
 <hbdocument version="1.1">
     <widget name="editorview" type="HbView">
         <widget name="content" role="HbView:widget" type="HbWidget">
-            <widget name="scrollArea" plugin="nmailuiwidgetsplugin" type="NmBaseViewScrollArea">
+            <widget name="scrollArea" type="NmBaseViewScrollArea">
                 <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
                     <widget name="editorToField" type="HbWidget">
                         <widget name="editorToLabel" type="HbLabel">
@@ -11,7 +11,7 @@
                             <string locid="txt_mail_editor_to" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorToEdit" plugin="nmailuiwidgetsplugin" type="NmRecipientLineEdit"/>
+                        <widget name="editorToEdit" type="NmRecipientLineEdit"/>
                         <widget name="editorToButton" type="HbPushButton">
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
                             <sizehint height="7.5un" type="FIXED" width="9.5un"/>
@@ -32,7 +32,7 @@
                             <string locid="txt_mail_editor_cc" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorCcEdit" plugin="nmailuiwidgetsplugin" type="NmRecipientLineEdit"/>
+                        <widget name="editorCcEdit" type="NmRecipientLineEdit"/>
                         <widget name="editorCcButton" type="HbPushButton">
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
                             <sizehint height="7.5un" type="FIXED" width="9.5un"/>
@@ -53,7 +53,7 @@
                             <string locid="txt_mail_editor_bcc" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorBccEdit" plugin="nmailuiwidgetsplugin" type="NmRecipientLineEdit"/>
+                        <widget name="editorBccEdit" type="NmRecipientLineEdit"/>
                         <widget name="editorBccButton" type="HbPushButton">
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
                             <sizehint height="7.5un" type="FIXED" width="9.5un"/>
@@ -74,7 +74,7 @@
                             <string locid="txt_mail_editor_subject" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorSubjectEdit" plugin="nmailuiwidgetsplugin" type="NmHtmlLineEdit"/>
+                        <widget name="editorSubjectEdit" type="NmHtmlLineEdit"/>
                         <widget name="editPriorityIcon" type="HbLabel">
                             <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
@@ -95,12 +95,12 @@
                             <linearitem itemname="editFollowUpIcon"/>
                         </layout>
                     </widget>
-                    <widget name="attachmentListWidget" plugin="nmailuiwidgetsplugin" type="NmAttachmentListWidget">
+                    <widget name="attachmentListWidget" type="NmAttachmentListWidget">
                         <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                         <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
                     </widget>
                     <widget name="BodyTextEditContainer" type="HbWidget">
-                        <widget name="BodyTextEdit" plugin="nmailuiwidgetsplugin" type="NmEditorTextEdit">
+                        <widget name="BodyTextEdit" type="NmEditorTextEdit">
                             <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
                             <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>