diff --git a/plugins/notifications/notification.cpp b/plugins/notifications/notification.cpp
index 7b95a846..52ef31c7 100644
--- a/plugins/notifications/notification.cpp
+++ b/plugins/notifications/notification.cpp
@@ -1,202 +1,202 @@
 /**
  * Copyright 2013 Albert Vaca <albertvaka@gmail.com>
  *
  * 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) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "notification.h"
 #include "notification_debug.h"
 
 #include <KNotification>
 #include <QtGlobal>
 #include <QIcon>
 #include <QString>
 #include <QUrl>
 #include <QPixmap>
 #include <KLocalizedString>
 #include <QFile>
 
 #include <QJsonArray>
 
 #include <core/filetransferjob.h>
 
 QMap<QString, FileTransferJob*> Notification::s_downloadsInProgress;
 
 Notification::Notification(const NetworkPacket& np, QObject* parent)
     : QObject(parent)
 {
     //Make a own directory for each user so noone can see each others icons
     QString username;
     #ifdef Q_OS_WIN
         username = qgetenv("USERNAME");
     #else
         username = qgetenv("USER");
     #endif
 
     m_imagesDir = QDir::temp().absoluteFilePath(QStringLiteral("kdeconnect_") + username);
     m_imagesDir.mkpath(m_imagesDir.absolutePath());
     QFile(m_imagesDir.absolutePath()).setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner | QFileDevice::ExeOwner);
     m_ready = false;
 
     parseNetworkPacket(np);
     createKNotification(np);
 
     connect(m_notification, QOverload<unsigned int>::of(&KNotification::activated), this, [this] (unsigned int actionIndex) {
         // Do nothing for our own reply action
         if(!m_requestReplyId.isEmpty() && actionIndex == 1) {
             return;
         }
         // Notification action idices start at 1
         Q_EMIT actionTriggered(m_internalId, m_actions[actionIndex - 1]);
     });
 }
 
 Notification::~Notification()
 {
 }
 
 void Notification::dismiss()
 {
     if (m_dismissable) {
         Q_EMIT dismissRequested(m_internalId);
     }
 }
 
 void Notification::show()
 {
     m_ready = true;
     Q_EMIT ready();
     if (!m_silent) {
         m_notification->sendEvent();
     }
 }
 
 void Notification::update(const NetworkPacket& np)
 {
     parseNetworkPacket(np);
     createKNotification(np);
 }
 
 void Notification::createKNotification(const NetworkPacket& np)
 {
     if (!m_notification) {
         m_notification = new KNotification(QStringLiteral("notification"), KNotification::CloseOnTimeout, this);
         m_notification->setComponentName(QStringLiteral("kdeconnect"));
     }
 
     QString escapedTitle = m_title.toHtmlEscaped();
     QString escapedText = m_text.toHtmlEscaped();
     QString escapedTicker = m_ticker.toHtmlEscaped();
 
     m_notification->setTitle(m_appName.toHtmlEscaped());
 
     if (m_title.isEmpty() && m_text.isEmpty()) {
        m_notification->setText(escapedTicker);
-    } else if (m_appName==m_title) {
+    } else if (m_appName == m_title) {
         m_notification->setText(escapedText);
-    } else if (m_title.isEmpty()){
+    } else if (m_title.isEmpty()) {
          m_notification->setText(escapedText);
-    } else if (m_text.isEmpty()){
+    } else if (m_text.isEmpty()) {
          m_notification->setText(escapedTitle);
     } else {
-        m_notification->setText(escapedTitle+": "+escapedText);
+        m_notification->setText(escapedTitle + ": " + escapedText);
     }
 
     m_hasIcon = m_hasIcon && !m_payloadHash.isEmpty();
 
     if (!m_hasIcon) {
         applyNoIcon();
         show();
     } else {
         m_iconPath = m_imagesDir.absoluteFilePath(m_payloadHash);
         loadIcon(np);
     }
 
     if (!m_requestReplyId.isEmpty()) {
         m_actions.prepend(i18n("Reply"));
         connect(m_notification, &KNotification::action1Activated, this, &Notification::reply, Qt::UniqueConnection);
     }
 
     m_notification->setActions(m_actions);
 }
 
 void Notification::loadIcon(const NetworkPacket& np)
 {
     m_ready = false;
 
     if (QFileInfo::exists(m_iconPath)) {
         applyIcon();
         show();
     } else {
         FileTransferJob* fileTransferJob = s_downloadsInProgress.value(m_iconPath);
         if (!fileTransferJob) {
             fileTransferJob = np.createPayloadTransferJob(QUrl::fromLocalFile(m_iconPath));
             fileTransferJob->start();
             s_downloadsInProgress[m_iconPath] = fileTransferJob;
         }
 
         connect(fileTransferJob, &FileTransferJob::result, this, [this, fileTransferJob]{
             s_downloadsInProgress.remove(m_iconPath);
             if (fileTransferJob->error()) {
                 qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Error in FileTransferJob: " << fileTransferJob->errorString();
                 applyNoIcon();
             } else {
                 applyIcon();
             }
             show();
         });
     }
 }
 
 void Notification::applyIcon()
 {
     QPixmap icon(m_iconPath, "PNG");
     m_notification->setPixmap(icon);
 }
 
 void Notification::applyNoIcon()
 {
     //HACK The only way to display no icon at all is trying to load a non-existent icon
     m_notification->setIconName(QStringLiteral("not_a_real_icon"));
 }
 
 void Notification::reply()
 {
     Q_EMIT replyRequested();
 }
 
 void Notification::parseNetworkPacket(const NetworkPacket& np)
 {
     m_internalId = np.get<QString>(QStringLiteral("id"));
     m_appName = np.get<QString>(QStringLiteral("appName"));
     m_ticker = np.get<QString>(QStringLiteral("ticker"));
     m_title = np.get<QString>(QStringLiteral("title"));
     m_text = np.get<QString>(QStringLiteral("text"));
     m_dismissable = np.get<bool>(QStringLiteral("isClearable"));
     m_hasIcon = np.hasPayload();
     m_silent = np.get<bool>(QStringLiteral("silent"));
     m_payloadHash = np.get<QString>(QStringLiteral("payloadHash"));
     m_requestReplyId = np.get<QString>(QStringLiteral("requestReplyId"), QString());
 
     m_actions.clear();
 
     const auto actions = np.get<QJsonArray>(QStringLiteral("actions"));
     for (const QJsonValue& value : actions) {
         m_actions.append(value.toString());
     }
 
 }