From 059a28ab14346e4bb1e73adcbe7214063fc6c378 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Mon, 20 Jul 2026 21:07:06 +0200
Subject: [PATCH] Fixed sorting in mails & show identity icon when no avatar
 available

---
 webui-src/app/mail/mail_util.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/webui-src/app/mail/mail_util.js b/webui-src/app/mail/mail_util.js
index e8f82f5..ad29988 100644
--- a/webui-src/app/mail/mail_util.js
+++ b/webui-src/app/mail/mail_util.js
@@ -175,15 +175,10 @@ const MessageSummary = () => {
                 },
               },
               [
-                fromUserInfo &&
-                  fromUserInfo.mAvatar &&
-                  fromUserInfo.mAvatar.mData &&
-                  fromUserInfo.mAvatar.mData.base64 &&
-                  fromUserInfo.mAvatar.mData.base64 !== '' &&
-                  m(peopleUtil.UserAvatar, {
-                  avatar: fromUserInfo.mAvatar,
-                  firstLetter: (fromUserInfo.mNickname || '').slice(0, 1).toUpperCase(),
-                  identityId: details.from._addr_string,
+                m(peopleUtil.UserAvatar, {
+                  avatar: fromUserInfo?.mAvatar,
+                  firstLetter: (fromUserInfo?.mNickname || '').slice(0, 1).toUpperCase(),
+                  identityId: details.from?._addr_string,
                   size: 24,
                 }),
                 m('span', fromUserInfo && Number(fromUserInfo.mId) !== 0 ? fromUserInfo.mNickname : '[Unknown]'),
@@ -477,8 +472,10 @@ function sortList(list) {
       case 'from': {
         const aSenderId = MessageCache[msgA.msgId]?.from?._addr_string || msgA.from?._addr_string;
         const bSenderId = MessageCache[msgB.msgId]?.from?._addr_string || msgB.from?._addr_string;
-        const aFrom = (aSenderId && (UserNicknamesCache[aSenderId] || rs.userList.userMap[aSenderId])) || '';
-        const bFrom = (bSenderId && (UserNicknamesCache[bSenderId] || rs.userList.userMap[bSenderId])) || '';
+        const aName = aSenderId && rs.userList.userMap[aSenderId];
+        const bName = bSenderId && rs.userList.userMap[bSenderId];
+        const aFrom = (UserNicknamesCache[aSenderId] || (aName && aName.name) || aName || '') + '';
+        const bFrom = (UserNicknamesCache[bSenderId] || (bName && bName.name) || bName || '') + '';
         valA = aFrom.toLowerCase();
         valB = bFrom.toLowerCase();
         break;