--- a/src/hbwidgets/popups/hbnotificationdialog.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbwidgets/popups/hbnotificationdialog.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -39,6 +39,7 @@
 #include <hbdevicedialogserverstatus_p.h>
 #include <hbtapgesture.h>
 #include <hbpangesture.h>
+#include <hbwidgetfeedback.h>
 
 #ifdef HB_EFFECTS
 #include "hbeffectinternal_p.h"
@@ -301,7 +302,12 @@
 {
     Q_D(HbNotificationDialog);
     d->checkAndCreateContentWidget();
-    d->content->setText( text );
+    d->content->setText(text);
+    if (text.isEmpty()) {
+        d->titleTextWrapping = Hb::TextWordWrap;
+    } else {
+        d->titleTextWrapping = Hb::TextNoWrap;
+    }
     d->setNotificationDialogContent();
 }
 
@@ -346,7 +352,7 @@
 Hb::TextWrapping HbNotificationDialog::titleTextWrapping() const
 {
     Q_D(const HbNotificationDialog);
-    return d->titleWrapping;
+    return d->titleTextWrapping;
 }
 
 /*!
@@ -358,10 +364,10 @@
 void HbNotificationDialog::setTitleTextWrapping(Hb::TextWrapping wrapping)
 {
     Q_D(HbNotificationDialog);
-    if (d->titleWrapping != wrapping) {
-        d->titleWrapping = wrapping;
+    if (d->titleTextWrapping != wrapping) {
+        d->titleTextWrapping = wrapping;
         if (d->content) {
-            d->content->setTitleTextWrapping(d->titleWrapping);
+            d->content->setTitleTextWrapping(d->titleTextWrapping);
         }
         d->doLayout();
     }
@@ -433,9 +439,11 @@
     Q_D(HbNotificationDialog);
     if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
         if(tap->state() == Qt::GestureStarted) {
+            HbWidgetFeedback::triggered(this, Hb::InstantPressed);
             d->stopTimeout();
         } else if(tap->state() == Qt::GestureFinished) {
             if (d->isTouchActivating) {
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
                 emit activated();
             }
             close();
@@ -507,9 +515,8 @@
 }
 
 HbNotificationDialogPrivate::HbNotificationDialogPrivate() :
-        HbDialogPrivate(), isTouchActivating(false),
-        titleWrapping(Hb::TextWordWrap),
-        content(0), sequentialShow(true)
+    HbDialogPrivate(), isTouchActivating(false), titleTextWrapping(Hb::TextWordWrap),
+    content(0), sequentialShow(true)
 {
 }
 
@@ -527,15 +534,14 @@
 }
 void HbNotificationDialogPrivate::setBackgroundStyle()
 {
-    Q_Q(HbNotificationDialog);
-    q->setBackgroundItem(HbStyle::P_NotificationDialog_frame);
+    setBackgroundItem(HbStyle::P_NotificationDialog_frame);
 }
 
 void HbNotificationDialogPrivate::setNotificationDialogContent()
 {
     Q_Q(HbNotificationDialog);
     content->enableTouchActivation(isTouchActivating);
-    content->setTitleTextWrapping(titleWrapping);
+    content->setTitleTextWrapping(titleTextWrapping);
     if (q->contentWidget() == content) {
         doLayout();
     } else {