diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 8b6fa69..8f49b11 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -8,8 +8,6 @@ target_sources(squawk PRIVATE
   account.h
   adapterfunctions.cpp
   adapterfunctions.h
-  archive.cpp
-  archive.h
   conference.cpp
   conference.h
   contact.cpp
@@ -23,13 +21,10 @@ target_sources(squawk PRIVATE
   signalcatcher.h
   squawk.cpp
   squawk.h
-  storage.cpp
-  storage.h
-  urlstorage.cpp
-  urlstorage.h
   )
 
 target_include_directories(squawk PRIVATE ${LMDB_INCLUDE_DIRS})
 
 add_subdirectory(handlers)
+add_subdirectory(storage)
 add_subdirectory(passwordStorageEngines)
diff --git a/core/networkaccess.h b/core/networkaccess.h
index 0b7bb7d..6ddfa99 100644
--- a/core/networkaccess.h
+++ b/core/networkaccess.h
@@ -30,7 +30,7 @@
 
 #include <set>
 
-#include "urlstorage.h"
+#include "storage/urlstorage.h"
 #include "shared/pathcheck.h"
 
 namespace Core {
diff --git a/core/rosteritem.h b/core/rosteritem.h
index d422e3f..5f99017 100644
--- a/core/rosteritem.h
+++ b/core/rosteritem.h
@@ -34,7 +34,7 @@
 #include "shared/enums.h"
 #include "shared/message.h"
 #include "shared/vcard.h"
-#include "archive.h"
+#include "storage/archive.h"
 #include "adapterfunctions.h"
 
 namespace Core {
diff --git a/core/storage/CMakeLists.txt b/core/storage/CMakeLists.txt
new file mode 100644
index 0000000..4c263d5
--- /dev/null
+++ b/core/storage/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(squawk PRIVATE
+    archive.cpp
+    archive.h
+    storage.cpp
+    storage.h
+    urlstorage.cpp
+    urlstorage.h
+)
diff --git a/core/archive.cpp b/core/storage/archive.cpp
similarity index 100%
rename from core/archive.cpp
rename to core/storage/archive.cpp
diff --git a/core/archive.h b/core/storage/archive.h
similarity index 100%
rename from core/archive.h
rename to core/storage/archive.h
diff --git a/core/storage.cpp b/core/storage/storage.cpp
similarity index 100%
rename from core/storage.cpp
rename to core/storage/storage.cpp
diff --git a/core/storage.h b/core/storage/storage.h
similarity index 100%
rename from core/storage.h
rename to core/storage/storage.h
diff --git a/core/urlstorage.cpp b/core/storage/urlstorage.cpp
similarity index 100%
rename from core/urlstorage.cpp
rename to core/storage/urlstorage.cpp
diff --git a/core/urlstorage.h b/core/storage/urlstorage.h
similarity index 100%
rename from core/urlstorage.h
rename to core/storage/urlstorage.h
diff --git a/shared/global.cpp b/shared/global.cpp
index 14ae90d..be660bd 100644
--- a/shared/global.cpp
+++ b/shared/global.cpp
@@ -357,8 +357,9 @@ void Shared::Global::notify(const QString& account, const Shared::Message& msg)
     QString name = QString(instance->rosterModel->getContactName(account, msg.getPenPalJid()));
     QString path = QString(instance->rosterModel->getContactIconPath(account, msg.getPenPalJid(), msg.getPenPalResource()));
     QVariantList args;
-    args << QString(QCoreApplication::applicationName());
-    args << QVariant(QVariant::UInt);   //TODO some normal id
+    args << QString();
+
+    args << qHash(msg.getId());
     if (path.size() > 0) {
         args << path;
     } else {
@@ -378,8 +379,13 @@ void Shared::Global::notify(const QString& account, const Shared::Message& msg)
 
     args << body;
     args << QStringList();
-    args << QVariantMap();
-    args << 3000;
+    args << QVariantMap({
+        {"desktop-entry", QString(QCoreApplication::applicationName())},
+        {"category", QString("message")},
+       // {"sound-file", "/path/to/macaw/squawk"},
+        {"sound-name", QString("message-new-instant")}
+    });
+    args << -1;
     instance->dbus.callWithArgumentList(QDBus::AutoDetect, "Notify", args);
 }
 
diff --git a/ui/models/roster.cpp b/ui/models/roster.cpp
index e5ada43..b96ddda 100644
--- a/ui/models/roster.cpp
+++ b/ui/models/roster.cpp
@@ -801,10 +801,10 @@ void Models::Roster::addRoom(const QString& account, const QString jid, const QM
     }
     
     Room* room = new Room(acc, jid, data);
-    connect(room, &Contact::requestArchive, this, &Roster::onElementRequestArchive);
-    connect(room, &Contact::fileDownloadRequest, this, &Roster::fileDownloadRequest);
-    connect(room, &Contact::unnoticedMessage, this, &Roster::unnoticedMessage);
-    connect(room, &Contact::localPathInvalid, this, &Roster::localPathInvalid);
+    connect(room, &Room::requestArchive, this, &Roster::onElementRequestArchive);
+    connect(room, &Room::fileDownloadRequest, this, &Roster::fileDownloadRequest);
+    connect(room, &Room::unnoticedMessage, this, &Roster::unnoticedMessage);
+    connect(room, &Room::localPathInvalid, this, &Roster::localPathInvalid);
     rooms.insert(std::make_pair(id, room));
     acc->appendChild(room);
 }
diff --git a/ui/widgets/messageline/messagefeed.cpp b/ui/widgets/messageline/messagefeed.cpp
index 33fbdd4..521e981 100644
--- a/ui/widgets/messageline/messagefeed.cpp
+++ b/ui/widgets/messageline/messagefeed.cpp
@@ -163,6 +163,12 @@ void Models::MessageFeed::changeMessage(const QString& id, const QMap<QString, Q
         }
         
         emit dataChanged(index, index, cr);
+
+        if (observersAmount == 0 && !msg->getForwarded() && changeRoles.count(MessageRoles::Text) > 0) {
+            unreadMessages->insert(id);
+            emit unreadMessagesCountChanged();
+            emit unnoticedMessage(*msg);
+        }
     }
 }