diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd4363c494c130586d98a143148cfae6ab33e30..779d5df6692decf905618457726dbda1e5aed32b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Fix crash when trying to maximize image, that wasn't downloaded yet.
 - Fix Binding restorMode flooding logs on Qt 5.14.2+
 - Fix with some qml styles hidden menu items leave empty space
+- Fix encrypted messages not showing a user in the sidebar
 
 ## [0.7.0] -- 2020-04-19
 
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 33b758940f62b79ebd9a95912232789efac77cde..4647240143f3fe9ef83d86d76fe3895282ba920b 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -179,8 +179,9 @@ utils::getMessageDescription(const TimelineEvent &event,
                 const auto ts       = QDateTime::fromMSecsSinceEpoch(msg->origin_server_ts);
 
                 DescInfo info;
-                info.userid    = sender;
-                info.body      = QString(" %1").arg(messageDescription<Encrypted>());
+                info.userid = sender;
+                info.body   = QString(" %1").arg(
+                  messageDescription<Encrypted>(username, "", sender == localUser));
                 info.timestamp = utils::descriptiveTime(ts);
                 info.event_id  = QString::fromStdString(msg->event_id);
                 info.datetime  = ts;