diff --git a/src/notificationhandler.cpp b/src/notificationhandler.cpp
index c858c141..d9aaa018 100644
--- a/src/notificationhandler.cpp
+++ b/src/notificationhandler.cpp
@@ -1,437 +1,437 @@
 /*
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 */
 
 /*
   copyright: (C) 2004 by Peter Simonsson
   email:     psn@linux.se
 */
 
 #include "notificationhandler.h"
 #include "common.h"
 #include "chatwindow.h"
 #include "application.h"
 #include "mainwindow.h"
 #include "viewcontainer.h"
 #include "trayicon.h"
 #include "server.h"
 #include "transfer.h"
 
 #include <QTextDocument>
 
 #include <KLocalizedString>
 #include <KNotification>
 
 
 namespace Konversation
 {
 
     NotificationHandler::NotificationHandler(Application* parent)
         : QObject(parent)
     {
         m_mainWindow = parent->getMainWindow();
     }
 
     NotificationHandler::~NotificationHandler()
     {
     }
 
     void NotificationHandler::message(ChatWindow* chatWin, const QString& fromNick, const QString& message)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         bool osd = Preferences::self()->oSDShowChannel() &&
             (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()));
 
         QString eventTitle = i18nc("Notification title; see Event/message in konversation.notifyrc", "New message from %1 in %2", fromNick, chatWin->getName());
 
         if (message.isEmpty())
         {
             KNotification::event(QLatin1String("message"), eventTitle, QString(QStringLiteral("&lt;%1&gt;")).arg(fromNick), QPixmap(), m_mainWindow);
 
             if (osd)
             {
                 Application* konvApp = Application::instance();
 
                 konvApp->osd->show(QLatin1Char('(') + chatWin->getName() + QStringLiteral(") <") + fromNick + QLatin1Char('>'));
             }
         }
         else
         {
             QString cleanedMessage = removeIrcMarkup(message);
             QString forKNotify = cleanedMessage.toHtmlEscaped();
 
             KNotification::event(QLatin1String("message"), eventTitle, QString(QStringLiteral("&lt;%1&gt; %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
 
             if (osd)
             {
                 Application* konvApp = Application::instance();
 
                 konvApp->osd->show(QLatin1Char('(') + chatWin->getName() + QStringLiteral(") <") + fromNick + QStringLiteral("> ") + cleanedMessage);
             }
         }
 
         if (!Preferences::self()->trayNotifyOnlyOwnNick())
         {
             startTrayNotification(chatWin);
         }
     }
 
     void NotificationHandler::nick(ChatWindow* chatWin, const QString& fromNick, const QString& message)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         bool osd = (Preferences::self()->oSDShowChannel() || Preferences::self()->oSDShowOwnNick()) &&
             (!m_mainWindow->isActiveWindow() ||
             (chatWin != m_mainWindow->getViewContainer()->getFrontView()));
 
         QString eventTitle = i18nc("Notification title; see Event/nick in konversation.notifyrc", "Your nick was mentioned by %1 in %2", fromNick, chatWin->getName());
 
         if (message.isEmpty())
         {
             KNotification::event(QLatin1String("nick"), eventTitle, QString(QStringLiteral("&lt;%1&gt;")).arg(fromNick), QPixmap(), m_mainWindow);
 
             if (osd)
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[HighLight] (%1) &lt;%2&gt;", chatWin->getName(), fromNick));
+                konvApp->osd->show(i18n("[HighLight] (%1) <%2>", chatWin->getName(), fromNick));
             }
         }
         else
         {
             QString cleanedMessage = removeIrcMarkup(message);
             QString forKNotify = cleanedMessage.toHtmlEscaped();
 
             KNotification::event(QLatin1String("nick"), eventTitle, QString(QStringLiteral("&lt;%1&gt; %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
 
             if (osd)
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[HighLight] (%1) &lt;%2&gt; %3", chatWin->getName(), fromNick, cleanedMessage));
+                konvApp->osd->show(i18n("[HighLight] (%1) <%2> %3", chatWin->getName(), fromNick, cleanedMessage));
             }
         }
 
         startTrayNotification(chatWin);
     }
 
     void NotificationHandler::queryMessage(ChatWindow* chatWin,
                                            const QString& fromNick, const QString& message)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         bool osd = Preferences::self()->oSDShowQuery() && (!m_mainWindow->isActiveWindow() ||
             (chatWin != m_mainWindow->getViewContainer()->getFrontView()));
 
         QString eventTitle = i18nc("Notification title; see Event/message in konversation.notifyrc", "New query message from %1", chatWin->getName());
 
         if (message.isEmpty()) // TODO document how this can happen, seems nonsensical
         {
             KNotification::event(QLatin1String("queryMessage"), eventTitle, QString(QStringLiteral("&lt;%1&gt;")).arg(fromNick), QPixmap(), m_mainWindow);
 
             if (osd)
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[Query] &lt;%1&gt;", fromNick));
+                konvApp->osd->show(i18n("[Query] <%1>", fromNick));
             }
         }
         else
         {
             QString cleanedMessage = removeIrcMarkup(message);
             QString forKNotify = cleanedMessage.toHtmlEscaped();
 
             KNotification::event(QLatin1String("queryMessage"), eventTitle, QString(QStringLiteral("&lt;%1&gt; %2")).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
 
             if (osd)
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[Query] &lt;%1&gt; %2", fromNick, cleanedMessage));
+                konvApp->osd->show(i18n("[Query] <%1> %2", fromNick, cleanedMessage));
             }
         }
 
         startTrayNotification(chatWin);
     }
 
     void NotificationHandler::startTrayNotification(ChatWindow* chatWin)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (!chatWin->getServer() || (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer()->isAway()))
             return;
 
         if (!m_mainWindow->isActiveWindow() && chatWin->getServer()->isConnected() && m_mainWindow->systemTrayIcon())
             m_mainWindow->systemTrayIcon()->startNotification();
 
     }
 
     void NotificationHandler::join(ChatWindow* chatWin, const QString& nick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("join"), i18n("%1 joined %2",nick, chatWin->getName()), QPixmap(), m_mainWindow);
 
         // OnScreen Message
         if(Preferences::self()->oSDShowChannelEvent() &&
             (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
         {
             Application* konvApp = Application::instance();
             konvApp->osd->show(i18n("%1 joined %2",nick, chatWin->getName()));
         }
     }
 
     void NotificationHandler::part(ChatWindow* chatWin, const QString& nick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("part"), i18n("%1 parted %2",nick, chatWin->getName()), QPixmap(), m_mainWindow);
 
         // OnScreen Message
         if(Preferences::self()->oSDShowChannelEvent() &&
             (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
         {
             Application* konvApp = Application::instance();
             konvApp->osd->show(i18n("%1 parted %2",nick, chatWin->getName()));
         }
     }
 
     void NotificationHandler::quit(ChatWindow* chatWin, const QString& nick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("part"), i18n("%1 quit %2",nick, chatWin->getServer()->getServerName()), QPixmap(), m_mainWindow);
     }
 
     void NotificationHandler::nickChange(ChatWindow* chatWin, const QString& oldNick, const QString& newNick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("nickchange"), i18n("%1 changed nickname to %2",oldNick, newNick), QPixmap(), m_mainWindow);
     }
 
     void NotificationHandler::dccIncoming(ChatWindow* chatWin, const QString& fromNick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("dcc_incoming"), i18n("%1 wants to send a file to you",fromNick), QPixmap(), m_mainWindow);
     }
 
     void NotificationHandler::dccError(ChatWindow* chatWin, const QString& error)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("dcc_error"), i18n("An error has occurred in a DCC transfer: %1",error), QPixmap(), m_mainWindow);
     }
 
     void NotificationHandler::dccTransferDone(ChatWindow* chatWin, const QString& file, DCC::Transfer* transfer)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         if (transfer->getType() == DCC::Transfer::Send)
         {
             KNotification::event(QLatin1String("dcctransfer_done"), i18nc("%1 - filename","%1 File Transfer is complete",file), QPixmap(), m_mainWindow);
         }
         else
         {
             KNotification *notification = new KNotification(QStringLiteral("dcctransfer_done"), m_mainWindow);
             notification->setText(i18nc("%1 - filename","%1 File Transfer is complete", file));
             //notification->setPixmap( QPixmap() );
             notification->setActions(QStringList(i18nc("Opens the file from the finished dcc transfer", "Open")));
             connect(notification, SIGNAL(activated(unsigned)), transfer, SLOT(runFile()));
             notification->sendEvent();
         }
     }
 
     void NotificationHandler::mode(ChatWindow* chatWin, const QString& nick, const QString& subject, const QString& change)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification *ev=new KNotification(QStringLiteral("mode"), m_mainWindow);
         ev->setText(i18n("%1 changed modes in %2: %3", nick, subject, change));
         ev->sendEvent();
     }
 
     void NotificationHandler::query(ChatWindow* chatWin, const QString& fromNick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         startTrayNotification(chatWin);
 
         KNotification *ev=new KNotification(QStringLiteral("query"), m_mainWindow);
         ev->setText(i18n("%1 has started a conversation (query) with you.",fromNick));
         ev->sendEvent();
     }
 
     void NotificationHandler::nickOnline(ChatWindow* chatWin, const QString& nick)
     {
         if (!chatWin)
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification *ev=new KNotification(QStringLiteral("notify"), m_mainWindow);
         ev->setText(i18n("%1 is online (%2).", nick, chatWin->getServer()->getServerName()));
         ev->sendEvent();
 
     }
 
     void NotificationHandler::nickOffline(ChatWindow* chatWin, const QString& nick)
     {
         if (!chatWin)
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification *ev=new KNotification(QStringLiteral("notify"), m_mainWindow);
         ev->setText(i18n("%1 went offline (%2).", nick, chatWin->getServer()->getServerName()));
         ev->sendEvent();
 
     }
 
     void NotificationHandler::kick(ChatWindow* chatWin, const QString& channel,const QString& nick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification *ev=new KNotification(QStringLiteral("kick"), m_mainWindow);
         ev->setText(i18n("You are kicked by %1 from %2", nick, channel));
         ev->sendEvent();
 
     }
 
     void NotificationHandler::dccChat(ChatWindow* chatWin, const QString& nick)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification *ev=new KNotification(QStringLiteral("dccChat"), m_mainWindow);
         ev->setText(i18n("%1 started a DCC chat with you", nick));
         ev->sendEvent();
 
     }
 
     void NotificationHandler::highlight(ChatWindow* chatWin, const QString& fromNick, const QString& message)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         startTrayNotification(chatWin);
 
         QString cleanedMessage = removeIrcMarkup(message);
         QString forKNotify = cleanedMessage.toHtmlEscaped();
 
         if(fromNick.isEmpty()) // TODO document this one too
         {
             QString eventTitle = i18nc("Notification title; see Event/highlight in konversation.notifyrc", "Highlight triggered in %1", chatWin->getName());
             KNotification::event(QLatin1String("highlight"), eventTitle, QString(QStringLiteral("(%1) *** %2")).arg(chatWin->getName()).arg(forKNotify), QPixmap(), m_mainWindow);
         }
         else
         {
             QString eventTitle = i18nc("Notification title; see Event/highlight in konversation.notifyrc", "Highlight triggered by %2 in %1", chatWin->getName(), fromNick);
             KNotification::event(QLatin1String("highlight"), eventTitle, QString(QStringLiteral("(%1) &lt;%2&gt; %3")).arg(chatWin->getName()).arg(fromNick).arg(forKNotify), QPixmap(), m_mainWindow);
         }
 
         if(Preferences::self()->oSDShowOwnNick() &&
             (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
         {
             Application* konvApp = Application::instance();
             // if there was no nick associated, this must be a command message, so don't try displaying
             // an empty nick in <>
             if(fromNick.isEmpty())
                 konvApp->osd->show(i18n("[HighLight] (%1) *** %2",chatWin->getName(),cleanedMessage));
             // normal highlight message
             else
-                konvApp->osd->show(i18n("[HighLight] (%1) &lt;%2&gt; %3",chatWin->getName(),fromNick,cleanedMessage));
+                konvApp->osd->show(i18n("[HighLight] (%1) <%2> %3",chatWin->getName(),fromNick,cleanedMessage));
         }
     }
 
     void NotificationHandler::connectionFailure(ChatWindow* chatWin, const QString& server)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         KNotification *ev=new KNotification(QStringLiteral("connectionFailure"), m_mainWindow);
         ev->setText(i18n("Failed to connect to %1", server));
         ev->sendEvent();
 
     }
 
     void NotificationHandler::channelJoin(ChatWindow* chatWin, const QString& channel)
     {
         if (!chatWin || !chatWin->notificationsEnabled())
             return;
 
         if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
             return;
 
         KNotification::event(QLatin1String("channelJoin"), i18n("You have joined %1.",channel), QPixmap(), m_mainWindow);
     }
 
 }