--- qtui/mainwin.cpp.bak	2008-08-12 16:28:13.000000000 +1000
+++ qtui/mainwin.cpp	2008-08-13 20:16:46.000000000 +1000
@@ -620,9 +620,10 @@
   QMap<QString, QVariant> hints;
   UiSettings uiSettings;
 
+/* Commenting out the following: Don't send hints, let notify daemon decide
   hints["x"] = uiSettings.value("NotificationDesktopHintX", QVariant(0)).toInt(); // Standard hint: x location for the popup to show up
   hints["y"] = uiSettings.value("NotificationDesktopHintY", QVariant(0)).toInt(); // Standard hint: y location for the popup to show up
-
+*/
   actions << "click" << "Click Me!";
 
   QDBusReply<uint> reply = desktopNotifications->Notify(
@@ -630,7 +631,7 @@
                 notificationId, // ID of previous notification to replace
                 "", // Icon to display
                 title, // Summary / Header of the message to display
-                QString("%1: %2:\n%3").arg(QTime::currentTime().toString()).arg(title).arg(message), // Body of the message to display
+                QString("%1: %2:\n%3").arg(QTime::currentTime().toString()).arg(title).arg(message).replace(QRegExp("&"),"&amp;").replace( QRegExp("<"),"&lt;").replace(QRegExp(">"),"&gt;"), // Body of the message to display
                 actions, // Actions from which the user may choose
                 hints, // Hints to the server displaying the message
                 uiSettings.value("NotificationDesktopTimeout", QVariant(5000)).toInt() // Timeout in milliseconds