diff -r bf7eb7911fc5 -r 997a02608b3a emailuis/nmailcpplugin/src/nmsettingsplugin.cpp
--- a/emailuis/nmailcpplugin/src/nmsettingsplugin.cpp	Wed Jun 23 18:00:21 2010 +0300
+++ b/emailuis/nmailcpplugin/src/nmsettingsplugin.cpp	Tue Jul 06 14:04:34 2010 +0300
@@ -27,7 +27,7 @@
 
 /*!
     \class NmSettingsPlugin
-    \brief The class implements CpPluginPlatInterface which is an interface
+    \brief The class implements CpPluginInterface which is an interface
            for plug-ins that are displayed in the control panel application.
            The class works as an entry point for NMail settings.
 
@@ -67,19 +67,20 @@
     \param itemDataHelper Helper class that helps control panel plug-ins to
            connect slots to inner widgets of the setting items.
 
-    \return Instance of CpSettingFormItemData.
-            Caller is the owner of the returned instance.
+    \return List of CpSettingFormItemData items.
 */
-CpSettingFormItemData *NmSettingsPlugin::createSettingFormItemData(
+QList<CpSettingFormItemData*> NmSettingsPlugin::createSettingFormItemData(
     CpItemDataHelper &itemDataHelper) const
 {
     NM_FUNCTION;
     
     HbIcon icon("qtg_large_email");
+    QList<CpSettingFormItemData*> list;
 
-    return new NmSettingsViewFactory(itemDataHelper,
-        hbTrId("txt_mail_title_control_panel"), "",
-        icon);
+    CpSettingFormItemData* viewFactory = new NmSettingsViewFactory(itemDataHelper,
+        hbTrId("txt_mail_title_control_panel"), "", icon);
+    list.append(viewFactory);
+    return list;
 }
 
 Q_EXPORT_PLUGIN2(nmsettingsplugin, NmSettingsPlugin);