From d1f0b76c1ab6fa7981b27ec1809a9fe8bb1b9e7e Mon Sep 17 00:00:00 2001
From: souravson1 <sauravsoni8980@gmail.com>
Date: Mon, 23 Feb 2026 16:44:25 +0530
Subject: [PATCH 1/3] Remove Unwanted Options From Context Menu

---
 .../src/components/message/Message.tsx        | 78 ++-----------------
 1 file changed, 5 insertions(+), 73 deletions(-)

diff --git a/packages/frontend/src/components/message/Message.tsx b/packages/frontend/src/components/message/Message.tsx
index bcfcea2d..2cc14532 100644
--- a/packages/frontend/src/components/message/Message.tsx
+++ b/packages/frontend/src/components/message/Message.tsx
@@ -431,53 +431,6 @@ async function buildContextMenu(
       action: openForwardDialog.bind(null, openDialog, message),
       rightIcon: 'forward',
     },
-    // Recall message
-    showRecallMsg && {
-      label: tx('recall_message'),
-      action: async () => {
-        const response = await runtime.PrivittySendMessage('sendEvent', {
-          event_type: 'initAccessRevokeRequest',
-          event_data: {
-            chat_id: String(chat?.id),
-            file_path: message?.file,
-          },
-        })
-
-        // ✅ Parse ONLY ONCE
-        const parsed =
-          typeof response === 'string' ? JSON.parse(response) : response
-
-        const pdu: string | undefined = parsed?.result?.data?.pdu
-
-        if (!pdu) {
-          throw new Error('PDU not returned from initAccessRevokeRequest')
-        }
-
-        const MESSAGE_DEFAULT: T.MessageData = {
-          file: null,
-          filename: null,
-          viewtype: null,
-          html: null,
-          location: null,
-          overrideSenderName: null,
-          quotedMessageId: null,
-          quotedText: null,
-          text: null,
-        }
-        const messageR: Partial<T.MessageData> = {
-          text: pdu,
-          file: undefined,
-          filename: undefined,
-          quotedMessageId: null,
-          viewtype: 'Text',
-        }
-
-        await BackendRemote.rpc.sendMsg(accountId, chat?.id || 0, {
-          ...MESSAGE_DEFAULT,
-          ...messageR,
-        })
-      },
-    },
     // Send emoji reaction
     showSendReaction && {
       label: tx('react'),
@@ -512,11 +465,6 @@ async function buildContextMenu(
       },
       rightIcon: 'bookmark-filled',
     },
-    // Save attachment as
-    showAttachmentOptions && {
-      label: tx('save_as'),
-      action: onDownload.bind(null, message),
-    },
     // copy link
     link !== '' &&
       isLink && {
@@ -525,7 +473,7 @@ async function buildContextMenu(
         rightIcon: 'link',
       },
     // copy item (selection or all text)
-    text !== '' && copy_item,
+    text !== '' && !message.file && copy_item,
     // Copy image
     showCopyImage && {
       label: tx('menu_copy_image_to_clipboard'),
@@ -542,14 +490,6 @@ async function buildContextMenu(
           runtime.writeClipboardText(message.videochatUrl as string),
         rightIcon: 'link',
       },
-    // Open Attachment
-    showAttachmentOptions &&
-      showRecallMsg &&
-      message.viewType !== 'Webxdc' &&
-      isGenericAttachment(message.fileMime) && {
-        label: tx('open_attachment'),
-        action: openAttachmentInShell.bind(null, message),
-      },
     // Save Sticker to sticker collection
     message.viewType === 'Sticker' && {
       label: tx('add_to_sticker_collection'),
@@ -560,14 +500,6 @@ async function buildContextMenu(
           tx('saved')
         ),
     },
-    // Resend Message
-    showResend &&
-      showRecallMsg && {
-        label: tx('resend'),
-        action: () => {
-          BackendRemote.rpc.resendMessages(selectedAccountId(), [message.id])
-        },
-      },
     // Webxdc Info message: jump to app message
     Boolean(isWebxdcInfo && message.parentId) && {
       label: tx('show_app_in_chat'),
@@ -665,7 +597,7 @@ function getPrivittyStatusLabel(status: PrivittyStatus | null): string | null {
     case 'requested':
       return 'Access Requested'
     case 'expired':
-      return null // hidden; expiry label shown instead
+      return 'Access Expired' // hidden; expiry label shown instead
     case 'revoked':
       return 'Access revoked'
     case 'denied':
@@ -1641,20 +1573,20 @@ export default function Message(props: {
                   style={{
                     margin: 0,
                     fontSize: 12,
-                    color: privittyStatusColor,
+                    color: direction === 'outgoing' ? '#ffffff' : privittyStatusColor,
                   }}
                 >
                   {privittyStatusLabel}
                 </p>
               )}
               {/* "Access Until:" — shown for active and expired when expiry is set */}
-              {(privittyStatus === 'active' || privittyStatus === 'expired') &&
+              {(privittyStatus === 'active') &&
                 privittyExpiryTime != null && (
                   <p
                     style={{
                       margin: '2px 0 0',
                       fontSize: 12,
-                      color: '#666666',
+                      color: direction === 'outgoing' ? '#fff' : '#666666',
                     }}
                   >
                     Access Until: {formatExpiryTime(privittyExpiryTime)}

From e8f6ee1d2797cb2322b2406d4fab601a0e88a7c3 Mon Sep 17 00:00:00 2001
From: souravson1 <sauravsoni8980@gmail.com>
Date: Mon, 23 Feb 2026 17:59:38 +0530
Subject: [PATCH 2/3] Styling FileAccessStatusList Dialog and Buttons

---
 .../dialogs/FileAccessStatusDialog.tsx        | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx b/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx
index 2f871def..2f71144f 100644
--- a/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx
+++ b/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx
@@ -206,10 +206,10 @@ export default function FileAccessStatusDialog({
             <div
               style={{ display: 'flex', gap: 12, justifyContent: 'flex-end' }}
             >
-              <button onClick={onDialogClose}>Cancel</button>
+              <button onClick={onDialogClose} style={{fontSize: '18px', fontWeight: '400', padding: '14px 22px', borderRadius: '12px', border: 'none', cursor: 'pointer'}}>Cancel</button>
               <button
                 onClick={onConfirm}
-                style={{ backgroundColor: '#D93229', color: '#fff' }}
+                style={{fontSize: '18px', fontWeight: '400', backgroundColor: '#f26861', color: '#fff', padding: '14px 22px', borderRadius: '12px', border: 'none', cursor: 'pointer' }}
               >
                 Revoke Access
               </button>
@@ -240,8 +240,8 @@ export default function FileAccessStatusDialog({
             <div
               style={{ display: 'flex', gap: 12, justifyContent: 'flex-end' }}
             >
-              <button onClick={onDenied}>Denied</button>
-              <button onClick={onAccept}>Accept</button>
+              <button onClick={onDenied} style={{fontSize: '18px', fontWeight: '400', padding: '14px 22px', borderRadius: '12px', border: 'none', cursor: 'pointer'}}>Denied</button>
+              <button onClick={onAccept} style={{fontSize: '18px', fontWeight: '400', backgroundColor: '#6750A4', color: '#fff', padding: '14px 22px', borderRadius: '12px', border: 'none', cursor: 'pointer'}}>Accept</button>
             </div>
           </DialogContent>
         </DialogBody>
@@ -390,9 +390,8 @@ export default function FileAccessStatusDialog({
   }
 
   const getDisplayFileName = (): string => {
-    if (fileName) return fileName
-    if (filePath) return basename(filePath)
-    return 'File'
+    const name = fileName || (filePath ? basename(filePath) : 'File')
+    return name.replace(/\.prv$/, '')
   }
 
   const UserCard = ({
@@ -423,7 +422,7 @@ export default function FileAccessStatusDialog({
           alignItems: 'center',
           padding: '12px 16px',
           borderBottom: '1px solid #e0e0e0',
-          backgroundColor: '#fff',
+          backgroundColor: 'transparent',
           opacity: isRevoked ? 0.6 : 1,
         }}
       >
@@ -434,7 +433,6 @@ export default function FileAccessStatusDialog({
             height: '40px',
             borderRadius: '50%',
             backgroundColor: '#4a4a4a',
-            color: '#fff',
             display: 'flex',
             alignItems: 'center',
             justifyContent: 'center',
@@ -453,7 +451,6 @@ export default function FileAccessStatusDialog({
             style={{
               fontSize: '15px',
               fontWeight: '500',
-              color: '#000',
               marginBottom: '4px',
             }}
           >
@@ -463,7 +460,6 @@ export default function FileAccessStatusDialog({
             <div
               style={{
                 fontSize: '13px',
-                color: '#666',
                 display: 'flex',
                 alignItems: 'center',
                 gap: '4px',
@@ -549,10 +545,10 @@ export default function FileAccessStatusDialog({
             style={{
               padding: '16px 20px',
               borderBottom: '1px solid #e0e0e0',
-              backgroundColor: '#fafafa',
+              backgroundColor: 'transparent',
             }}
           >
-            <div style={{ fontSize: '15px', fontWeight: '500', color: '#000' }}>
+            <div style={{ fontSize: '15px', fontWeight: '500' }}>
               {getDisplayFileName()}
             </div>
           </div>
@@ -582,7 +578,7 @@ export default function FileAccessStatusDialog({
           )}
 
           {!loading && !error && (
-            <div style={{ backgroundColor: '#fafafa' }}>
+            <div style={{ backgroundColor: 'transparent' }}>
               {/* Shared section */}
               {sharedUsers.length > 0 && (
                 <div>
@@ -591,16 +587,15 @@ export default function FileAccessStatusDialog({
                       padding: '12px 20px',
                       fontSize: '14px',
                       fontWeight: '600',
-                      color: '#666',
                       textTransform: 'uppercase',
                       letterSpacing: '0.5px',
                       borderBottom: '1px solid #e0e0e0',
-                      backgroundColor: '#fff',
+                      backgroundColor: 'transparent',
                     }}
                   >
                     Shared
                   </div>
-                  <div style={{ backgroundColor: '#fff' }}>
+                  <div style={{ backgroundColor: 'transparent' }}>
                     {sharedUsers.map((user, index) => (
                       <UserCard
                         key={`shared-${index}`}
@@ -625,18 +620,17 @@ export default function FileAccessStatusDialog({
                       padding: '12px 20px',
                       fontSize: '14px',
                       fontWeight: '600',
-                      color: '#666',
                       textTransform: 'uppercase',
                       letterSpacing: '0.5px',
                       borderTop:
                         sharedUsers.length > 0 ? '1px solid #e0e0e0' : 'none',
                       borderBottom: '1px solid #e0e0e0',
-                      backgroundColor: '#fff',
+                      backgroundColor: 'transparent',
                     }}
                   >
                     Forwarded
                   </div>
-                  <div style={{ backgroundColor: '#fff' }}>
+                  <div style={{ backgroundColor: 'transparent' }}>
                     {forwardedUsers.map((user, index) => (
                       <UserCard
                         key={`forwarded-${index}`}
@@ -658,7 +652,6 @@ export default function FileAccessStatusDialog({
                   style={{
                     padding: '40px 20px',
                     textAlign: 'center',
-                    color: '#666',
                   }}
                 >
                   No access data available

From ac920166754309a2de58f05d1c4026870ec0f2b2 Mon Sep 17 00:00:00 2001
From: souravson1 <sauravsoni8980@gmail.com>
Date: Tue, 24 Feb 2026 10:48:15 +0530
Subject: [PATCH 3/3] Styling FileAccessStatusList Dialog and Buttons

merged conflicts

Bug: #55
Test: Verified above desktop changes with android device
---
 _locales/ar.xml                               |  4 +-
 _locales/az.xml                               | 22 +++---
 _locales/bg.xml                               | 22 +++---
 _locales/en.xml                               | 38 ++++-----
 .../dialogs/FileAccessStatusDialog.tsx        | 11 ++-
 .../src/components/message/Message.tsx        | 78 +------------------
 6 files changed, 54 insertions(+), 121 deletions(-)

diff --git a/_locales/ar.xml b/_locales/ar.xml
index 07b1eb1b..d1c335f9 100644
--- a/_locales/ar.xml
+++ b/_locales/ar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- common strings without special context -->
-    <string name="app_name">Delta Chat</string>
+    <string name="app_name">Privitty Chat</string>
     <string name="ok">موافق</string>
     <string name="cancel">إلغاء</string>
     <string name="yes">نعم</string>
@@ -186,7 +186,7 @@
     <string name="pref_theme">السمة</string>
     <string name="pref_language">اللغة</string>
     <string name="pref_use_system_emoji">استخدام الرموز التعبيرية بالنظام</string>
-    <string name="pref_use_system_emoji_explain"> Delta Chat تعطيل الرموز التعبيرية المدمجة في </string>
+    <string name="pref_use_system_emoji_explain"> Privitty Chat تعطيل الرموز التعبيرية المدمجة في </string>
     <string name="pref_chats">المحادثات</string>
     <string name="pref_in_chat_sounds">أصوات خلال الدردش</string>
     <string name="pref_other">أخرى</string>
diff --git a/_locales/az.xml b/_locales/az.xml
index c3127d11..d44bade3 100644
--- a/_locales/az.xml
+++ b/_locales/az.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- common strings without special context -->
-    <string name="app_name">Delta Chat</string>
+    <string name="app_name">Privitty Chat</string>
     <string name="ok">OK</string>
     <string name="cancel">Imtina</string>
     <string name="yes">Bəli</string>
@@ -202,7 +202,7 @@
         <item quantity="one">%d yeni messaj</item>
         <item quantity="other">%d yeni messaj</item>
     </plurals>
-    <string name="chat_new_group_hint">Başqalarının bu qrup daxilində cavab verməsinə imkan verən ilk mesajı yaradın. \n\n• Bütün üzvlər Delta Chat istifadə etsələr daha yaxşıdır. \n\n• İlk mesajı çatdırmaq bir müddət ala bilər.</string>
+    <string name="chat_new_group_hint">Başqalarının bu qrup daxilində cavab verməsinə imkan verən ilk mesajı yaradın. \n\n• Bütün üzvlər Privitty Chat istifadə etsələr daha yaxşıdır. \n\n• İlk mesajı çatdırmaq bir müddət ala bilər.</string>
     <string name="chat_record_slide_to_cancel">Ləğv etmək üçün sürüşdürün</string>
     <string name="chat_record_explain">Bir səsli mesajı yazmaq üçün toxunun və saxlayın, göndərmək üçün buraxın</string>
     <string name="chat_no_chats_yet_title">Qutu boşdur.\nYeni çata başlamaq üçün \"+\" işarəsinə toxunun. </string>
@@ -245,7 +245,7 @@
     <string name="login_header">Serverinə daxil ol</string>
     <string name="login_explain">Mövcud e-mail hesabı ilə daxil olun</string>
     <string name="login_subheader">Məlum elektron poçt provayderləri üçün əlavə parametrlər avtomatik olaraq quraşdırılır. Bəzən IMAP-ın web məkanında aktiv olması lazımdır. Yardım üçün e-poçt provayderinizə və ya dostlarınıza müraciət edin.</string>
-    <string name="login_no_servers_hint">Delta Chat serverləri yoxdur, məlumatlarınız cihazınızda qalır!</string>
+    <string name="login_no_servers_hint">Privitty Chat serverləri yoxdur, məlumatlarınız cihazınızda qalır!</string>
     <string name="login_inbox">Gələn</string>
     <string name="login_imap_login">IMAP logini</string>
     <string name="login_imap_server">IMAP server</string>
@@ -259,7 +259,7 @@
     <string name="login_smtp_security">SMTP təhlükəsizliyi</string>
     <string name="login_auth_method">Yetkiləndirmə metodu</string>
     <string name="login_info_oauth2_title">Sadələşdirilmiş tənzimləmə ilə davam edirsiniz?</string>
-    <string name="login_info_oauth2_text">Daxil edilmiş e-poçt ünvanı sadələşdirilmiş bir quraşdırma (OAuth2) dəstəkləyir. \n\nNövbəti addımda Delta Chat e-poçt tətbiqinizlə söhbət etməyə icazə verin. \n\n Delta Chat serverləri, cihazınızda qalır!</string>
+    <string name="login_info_oauth2_text">Daxil edilmiş e-poçt ünvanı sadələşdirilmiş bir quraşdırma (OAuth2) dəstəkləyir. \n\nNövbəti addımda Privitty Chat e-poçt tətbiqinizlə söhbət etməyə icazə verin. \n\n Privitty Chat serverləri, cihazınızda qalır!</string>
     <string name="login_certificate_checks">Sertifikat yoxlanmaları</string>
     <string name="login_error_mail">Xahiş edirik düzgün bir e-poçt ünvanı daxil et</string>
     <string name="login_error_server">Xahiş edirik, düzgün bir server / IP ünvanı daxil et</string>
@@ -316,7 +316,7 @@
     <string name="pref_read_receipts_explain">Bildirişlər aradan qaldırılırsa, başqalarının oxuduğu bildirişləri görə bilməyəcəksiniz.</string>
     <string name="pref_manage_keys">Açar edarəetməsi</string>
     <string name="pref_use_system_emoji">Sistem emojisini istifadə edin</string>
-    <string name="pref_use_system_emoji_explain">Emoji Delta chat üçün daxili dəstəyi bağlayın. </string>
+    <string name="pref_use_system_emoji_explain">Emoji Privitty chat üçün daxili dəstəyi bağlayın. </string>
     <string name="pref_chats">Çatlar</string>
     <string name="pref_in_chat_sounds">Çatda olan səslər</string>
     <string name="pref_view_log">Log-a bax</string>
@@ -343,7 +343,7 @@
     <string name="pref_imap_folder_warn_disable_defaults">Bu seçimi ləğv etsəniz, serverinizin və digər müştərilərinizin müvafiq olaraq konfiqurasiya olunduğundan əmin olun. \n\nAyrıca şeylər işləməyəcəkdir.</string>
     <string name="pref_watch_sent_folder">Göndərilmişlərin qovluğunu izləyin</string>
     <string name="pref_send_copy_to_self">Özünə kopya göndər</string>
-    <string name="pref_auto_folder_moves">DeltaChat qovluğuna avtomatik keçid</string>
+    <string name="pref_auto_folder_moves">PrivittyChat qovluğuna avtomatik keçid</string>
     <string name="pref_auto_folder_moves_explain">Çat söhbətləri Daxil olanlar qovluğunun yığılmaması üçün taşınır</string>
     <string name="pref_show_emails">Klassik e-poçtları göstər</string>
     <string name="pref_show_emails_no">Xeyir, ancaq çatlar</string>
@@ -413,11 +413,11 @@
     <!-- permissions -->
     <string name="perm_required_title">İzin tələb olunur</string>
     <string name="perm_continue">Davam edin</string>
-    <string name="perm_explain_access_to_camera_denied">Delta Chat şəkillər və ya video çəkmək üçün kamera icazə tələb edir, lakin bu, əbədi imtina edilmişdir. Proqramın sistem ayarlarına gedib \"İcazələr\"-i seçin və \"kamera\" izni verin.</string>
+    <string name="perm_explain_access_to_camera_denied">Privitty Chat şəkillər və ya video çəkmək üçün kamera icazə tələb edir, lakin bu, əbədi imtina edilmişdir. Proqramın sistem ayarlarına gedib \"İcazələr\"-i seçin və \"kamera\" izni verin.</string>
     <!-- give the user an idea where to find the "Microphone" option. the hint is only shown if access was initially denied by the user. pick up wordings really used on the systems, but do not be overly precise: things shift around often and there are too many system we support to track every detail and click path -->
-    <string name="perm_explain_access_to_mic_denied">Delta Chat yer əlavə etmək üçün yer icazə tələb edir, lakin daimi olaraq rədd edilmişdir. \"İcazələr\"-i seçin və\"Yerləşmə\" izni verin. </string>
-    <string name="perm_explain_access_to_storage_denied">Delta Chat, fotoşəkilləri, videoları və ya səsləri əlavə etmək və ya ixrac etmək üçün saxlama icazəsini tələb edir, lakin bu daimi olaraq rədd edildi. Xahiş edirik tətbiq ayarları menyusuna davam edin, \"İzinlər\" seçin və \"Yaddaş\" funksiyasını aktivləşdirin.</string>
-    <string name="perm_explain_access_to_location_denied">Delta Chat yer əlavə etmək üçün yer icazə tələb edir, lakin daimi olaraq rədd edilmişdir. \"İcazələr\"-i seçin və\"Yerləşmə\" izni verin. </string>
+    <string name="perm_explain_access_to_mic_denied">Privitty Chat yer əlavə etmək üçün yer icazə tələb edir, lakin daimi olaraq rədd edilmişdir. \"İcazələr\"-i seçin və\"Yerləşmə\" izni verin. </string>
+    <string name="perm_explain_access_to_storage_denied">Privitty Chat, fotoşəkilləri, videoları və ya səsləri əlavə etmək və ya ixrac etmək üçün saxlama icazəsini tələb edir, lakin bu daimi olaraq rədd edildi. Xahiş edirik tətbiq ayarları menyusuna davam edin, \"İzinlər\" seçin və \"Yaddaş\" funksiyasını aktivləşdirin.</string>
+    <string name="perm_explain_access_to_location_denied">Privitty Chat yer əlavə etmək üçün yer icazə tələb edir, lakin daimi olaraq rədd edilmişdir. \"İcazələr\"-i seçin və\"Yerləşmə\" izni verin. </string>
     <!-- dc_str_* resources -->
     <string name="encrypted_message">Şifrələnmiş mesaj</string>
 
@@ -454,5 +454,5 @@
     <string name="menu.view.developer.open.log.folder">Loq mələfini açın</string>
     <string name="menu.view.developer.open.current.log.file">Loq-faylı açın</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
-    <string name="perm_enable_bg_reminder_title">Delta Chat arxa fonda mesajları almaq üçün bura toxunun.</string>
+    <string name="perm_enable_bg_reminder_title">Privitty Chat arxa fonda mesajları almaq üçün bura toxunun.</string>
     </resources>
diff --git a/_locales/bg.xml b/_locales/bg.xml
index 43fe5dc0..cab4b630 100644
--- a/_locales/bg.xml
+++ b/_locales/bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- common strings without special context -->
-    <string name="app_name">Delta Chat</string>
+    <string name="app_name">Privitty Chat</string>
     <string name="ok">OK</string>
     <string name="cancel">Отказ</string>
     <string name="clear_search">Изчистване на търсенето</string>
@@ -42,7 +42,7 @@
     <string name="unarchive">Деархивиране</string>
     <string name="mute">Изключване на звука</string>
     <string name="ephemeral_messages">Изчезващи съобщения</string>
-    <string name="ephemeral_messages_hint">Приложимо за всички членове на този чат, ако използват Delta Chat; в противен случай те пак могат да копират, записват и препращат съобщения или да използват други клиенти за електронна поща.</string>
+    <string name="ephemeral_messages_hint">Приложимо за всички членове на този чат, ако използват Privitty Chat; в противен случай те пак могат да копират, записват и препращат съобщения или да използват други клиенти за електронна поща.</string>
     <string name="save">Записване</string>
     <string name="chat">Чат</string>
     <string name="media">Медия</string>
@@ -318,7 +318,7 @@
     <string name="videochat_tap_to_open">Докоснете, за да отворите</string>
     <string name="videochat_instance">Сървър за видеочат</string>
     <string name="videochat_instance_placeholder">Вашият сървър за видеочат</string>
-    <!-- Do not translate "$ROOM", since it is a fixed token Delta Chat will replace with a generated room ID like "aOclju5eCky" -->
+    <!-- Do not translate "$ROOM", since it is a fixed token Privitty Chat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Примери: https://meet.jit.si/$ROOM или basicwebrtc:https://вашият-сървър</string>
     <string name="videochat_instance_explain_2">Ако настройката е разрешена, можете да започвате видеочат от всеки чат. Изисква съвместимо приложение или браузър и от двете страни.</string>
     <string name="videochat_instance_from_qr">Да се използва ли \"%1$s\" за поканване на други към видеочатове?\n\nСлед като тази настройка бъде зададена, ще можете да започвате видеочат от всеки чат. Тя ще замени предишната настройка за видеочатове, ако има такава.</string>
@@ -482,9 +482,9 @@
     <string name="multidevice_title">Добавяне на допълнително устройство</string>
     <string name="multidevice_same_network_hint">Уверете се, че и двете устройства са свързани към една и съща Wi-Fi или друга мрежа</string>
     <string name="multidevice_this_creates_a_qr_code">Ще бъде създаден QR код, чрез сканиране на който другото устройство може да копира акаунта.</string>
-    <string name="multidevice_install_dc_on_other_device">Инсталирайте Delta Chat на другото Ви устройство (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Инсталирайте Privitty Chat на другото Ви устройство (https://get.Privitty.chat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
-    <string name="multidevice_tap_scan_on_other_device">Стартирайте Delta Chat, докоснете \"Добавяне като допълнително устройство\" и сканирайте кода, показан тук</string>
+    <string name="multidevice_tap_scan_on_other_device">Стартирайте Privitty Chat, докоснете \"Добавяне като допълнително устройство\" и сканирайте кода, показан тук</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
     <string name="multidevice_qr_subtitle">Сканирайте, за да установите допълнително устройство за %1$s</string>
     <string name="multidevice_receiver_title">Добавяне като допълнително устройство</string>
@@ -557,7 +557,7 @@
     <string name="login_header">Влизане във Вашия акаунт за електронна поща</string>
     <string name="login_explain">Влизане със съществуващ акаунт за електронна поща</string>
     <string name="login_subheader">За известните доставчици на електронна поща допълнителните настройки се попълват автоматично. Понякога е необходимо да се разреши IMAP в уеб настройките. Потърсете помощ от Вашия доставчик на електронна поща или приятели.</string>
-    <string name="login_no_servers_hint">Delta Chat няма сървъри, Вашите данни стоят на Вашето устройство.</string>
+    <string name="login_no_servers_hint">Privitty Chat няма сървъри, Вашите данни стоят на Вашето устройство.</string>
     <string name="login_inbox">Входящи</string>
     <string name="login_imap_login"> Име за влизане на IMAP</string>
     <string name="login_imap_server">IMAP сървър</string>
@@ -571,7 +571,7 @@
     <string name="login_smtp_security">Сигурност на SMTP връзката</string>
     <string name="login_auth_method">Метод за оторизация</string>
     <string name="login_info_oauth2_title">Да се продължи ли с опростената настройка?</string>
-    <string name="login_info_oauth2_text">Въведеният адрес за електронна поща поддържа опростена настройка (OAuth 2.0).\n\nНа следващата стъпка, моля позволете на Delta Chat да действа в качеството си на избраното от Вас приложение за чат върху електронна поща.\n\nDelta Chat няма сървъри, Вашите данни стоят на Вашето устройство.</string>
+    <string name="login_info_oauth2_text">Въведеният адрес за електронна поща поддържа опростена настройка (OAuth 2.0).\n\nНа следващата стъпка, моля позволете на Privitty Chat да действа в качеството си на избраното от Вас приложение за чат върху електронна поща.\n\nPrivitty Chat няма сървъри, Вашите данни стоят на Вашето устройство.</string>
     <string name="login_certificate_checks">Проверки на сертификатите</string>
     <string name="login_error_mail">Моля, въведете валиден адрес за електронна поща</string>
     <string name="login_error_server">Моля, въведете валиден адрес / IP адрес на сървър</string>
@@ -653,7 +653,7 @@
     <string name="pref_encryption">Криптиране</string>
     <string name="pref_manage_keys">Управление на ключове</string>
     <string name="pref_use_system_emoji">Да се използва Emoji на системата</string>
-    <string name="pref_use_system_emoji_explain">Изключване на вградената поддръжка за Emoji на Delta Chat</string>
+    <string name="pref_use_system_emoji_explain">Изключване на вградената поддръжка за Emoji на Privitty Chat</string>
     <string name="pref_show_system_contacts">Прочитане на системната адресна книга</string>
     <string name="pref_show_system_contacts_explain">Да се предлага създаване на чатове с контакти от адресната книга. За някои доставчици е необходимо първо да се настрои криптиране от край до край.</string>
     <string name="pref_chats">Чатове</string>
@@ -688,10 +688,10 @@
     <string name="pref_watch_sent_folder">Да бъде наблюдавана папката \"Изпратени\"</string>
     <string name="pref_send_copy_to_self">Изпращане на копие до себе си</string>
     <string name="pref_send_copy_to_self_explain">Изисква се, когато този акант се използва на повече от едно устройство.</string>
-    <string name="pref_auto_folder_moves">Автоматично преместване в папката DeltaChat</string>
+    <string name="pref_auto_folder_moves">Автоматично преместване в папката PrivittyChat</string>
     <string name="pref_auto_folder_moves_explain">Разговорите са преместени, за да се избегне претрупване на папката \"Входящи\"</string>
-    <string name="pref_only_fetch_mvbox_title">Да се извлича само от папката DeltaChat</string>
-    <string name="pref_only_fetch_mvbox_explain">Другите папки да не бъдат взимани под внимание. Изисква Вашият сървър да премества чат съобщенията в папката DeltaChat.</string>
+    <string name="pref_only_fetch_mvbox_title">Да се извлича само от папката PrivittyChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Другите папки да не бъдат взимани под внимание. Изисква Вашият сървър да премества чат съобщенията в папката PrivittyChat.</string>
     <string name="pref_show_emails">Да се показват класически e-mail съобщения</string>
     <string name="pref_show_emails_no">Не, само чатове</string>
     <string name="pref_show_emails_accepted_contacts">За приетите контакти</string>
diff --git a/_locales/en.xml b/_locales/en.xml
index baf71cfd..28efd9cf 100644
--- a/_locales/en.xml
+++ b/_locales/en.xml
@@ -363,7 +363,7 @@
     <string name="videochat_tap_to_open">Tap to Open</string>
     <string name="videochat_instance">Video Chat Instance</string>
     <string name="videochat_instance_placeholder">Your Video Chat Instance</string>
-    <!-- Do not translate "$ROOM", since it is a fixed token Delta Chat will replace with a generated room ID like "aOclju5eCky" -->
+    <!-- Do not translate "$ROOM", since it is a fixed token Privitty Chat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Example: https://your-server.org/$ROOM</string>
     <string name="videochat_instance_explain_2">If enabled, you can start a video chat from each chat. Requires a compatible app or a browser on both ends.</string>
     <string name="videochat_instance_from_qr">Use \"%1$s\" to invite others to video chats?\n\nOnce set, you can start a video chat from each chat. This replaces any previous setting for video chats.</string>
@@ -547,9 +547,9 @@
     <string name="multidevice_title">Add Second Device</string>
     <string name="multidevice_same_network_hint">Make sure both devices are on the same Wi-Fi or network</string>
     <string name="multidevice_this_creates_a_qr_code">This creates a QR code that the second device can scan to copy the profile.\n\nMake sure no unwanted observer or camera can see the following screen.</string>
-    <string name="multidevice_install_dc_on_other_device">Install Delta Chat on your other device (https://get.delta.chat)</string>
+    <string name="multidevice_install_dc_on_other_device">Install Privitty Chat on your other device (https://get.Privitty.chat)</string>
     <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
-    <string name="multidevice_tap_scan_on_other_device">Start Delta Chat, tap “I Already Have a Profile / Add as Second Device” and scan the code shown here</string>
+    <string name="multidevice_tap_scan_on_other_device">Start Privitty Chat, tap “I Already Have a Profile / Add as Second Device” and scan the code shown here</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
     <string name="multidevice_qr_subtitle">Scan to set up second device for %1$s</string>
     <string name="multidevice_receiver_title">Add as Second Device</string>
@@ -943,7 +943,7 @@
     <string name="chat_protection_enabled_tap_to_learn_more">Messages are guaranteed to be end-to-end encrypted from now on. Tap to learn more.</string>
     <string name="chat_protection_enabled_explanation">It is now guaranteed that all messages in this chat are end-to-end encrypted.\n\nEnd-to-end encryption keeps messages private between you and your chat partners. Not even servers, providers or relays can read them.</string>
     <string name="chat_protection_broken_tap_to_learn_more">%1$s sent a message from another device. Tap to learn more.</string>
-    <string name="chat_protection_broken_explanation">End-to-end encryption cannot be guaranteed anymore, likely because %1$s reinstalled Delta Chat or sent a message from another device.\n\nYou may meet them in person and scan their QR code again to reestablish guaranteed end-to-end encryption.</string>
+    <string name="chat_protection_broken_explanation">End-to-end encryption cannot be guaranteed anymore, likely because %1$s reinstalled Privitty Chat or sent a message from another device.\n\nYou may meet them in person and scan their QR code again to reestablish guaranteed end-to-end encryption.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s requires end-to-end encryption which is not setup for this chat yet. Tap to learn more.</string>
     <string name="invalid_unencrypted_explanation">To establish end-to-end-encryption, you may meet contacts in person and scan their QR Code to introduce them.</string>
     <string name="learn_more">Learn More</string>
@@ -953,7 +953,7 @@
     <string name="devicemsg_storage_exceeding">⚠️ Your provider\'s storage is about to run out: %1$s%% are already used.\n\nYou may not be able to receive messages if storage is full.\n\n👉 Please check if you can delete old data in the provider\'s web interface and consider enabling \"Settings / Chats and Media / Delete Old Messages\". You can check your current storage usage anytime at \"Settings / Connectivity\".</string>
     <!-- %1%s will be replaced by date and time in some human-readable format -->
     <string name="devicemsg_bad_time">⚠️ Date or time on your device seems to be inaccurate (%1$s).\n\nAdjust your clock ⏰🔧 to ensure your messages are received correctly.</string>
-    <string name="devicemsg_update_reminder">⚠️ Your Delta Chat version might be outdated.\n\nThis may cause problems because your chat partners use newer versions - and you are missing the latest features 😳\nPlease check https://get.delta.chat or your app store for updates.</string>
+    <string name="devicemsg_update_reminder">⚠️ Your Privitty Chat version might be outdated.\n\nThis may cause problems because your chat partners use newer versions - and you are missing the latest features 😳\nPlease check https://get.Privitty.chat or your app store for updates.</string>
 
     <!-- Some options as "Add Second Device" or "Backup" may require the system PIN/Fingerprint/Gesture/Etc. to be entered in a system dialog. This hint is added to the system dialog, below a title as "Add Second Device" or "Backup". -->
     <string name="enter_system_secret_to_continue">Unlock to continue</string>
@@ -1042,7 +1042,7 @@
     <string name="perm_explain_access_to_mic_denied">To send audio messages, go to system or app settings, select "Permissions" or "Privacy &amp; Security", and enable \"Microphone\".</string>
     <string name="perm_explain_access_to_storage_denied">To receive or send files, go to the app settings, select \"Permissions\", and enable \"Storage\".</string>
     <string name="perm_explain_access_to_location_denied">To attach a location, go to the app settings, select \"Permissions\", and enable \"Location\".</string>
-    <string name="perm_explain_access_to_notifications_denied">To receive notifications, go to \"System Settings / Apps / Delta Chat\" and enable \"Notifications\".</string>
+    <string name="perm_explain_access_to_notifications_denied">To receive notifications, go to \"System Settings / Apps / Privitty Chat\" and enable \"Notifications\".</string>
 
     <!-- ImageEditorHud -->
     <string name="ImageEditorHud_draw_anywhere_to_blur">Draw anywhere to blur</string>
@@ -1141,7 +1141,7 @@
     <string name="import_device_contacts">Import device contacts</string>
     <string name="import_device_contacts_hint">To chat with contacts from your device open Settings and enable \"Contacts\".</string>
     <!-- iOS notification settings -->
-    <string name="disabled_in_dc">Disabled in Delta Chat</string>
+    <string name="disabled_in_dc">Disabled in Privitty Chat</string>
     <string name="disabled_in_system_settings">Disabled in system settings</string>
     <string name="bg_app_refresh_disabled">\"Background App Refresh\" disabled in system settings</string>
     <!-- iOS connectivity view, Adjective, used eg. as "Notifications: Delayed" -->
@@ -1156,20 +1156,20 @@
     <!-- use the same translation for "Shortcuts" as the system is using, often the term "Shortcut" stays untranslated; check eg. how the "Shortcuts" system app is called in your locale -->
     <string name="shortcuts_widget_title">Shortcuts</string>
     <!-- use the same translation for "Widget" as the system is using; often the term "Widget" stays untranslated -->
-    <string name="shortcuts_widget_description">Use Delta Chat\'s \"Add to Widget\" to add items</string>
+    <string name="shortcuts_widget_description">Use Privitty Chat\'s \"Add to Widget\" to add items</string>
     <!-- use the same translation for "Widget" as the system is using; often the term "Widget" stays untranslated -->
     <string name="remove_from_widget">Remove from Widget</string>
     <!-- use the same translation for "Widget" as the system is using; often the term "Widget" stays untranslated -->
     <string name="add_to_widget">Add to Widget</string>
     <!-- iOS permissions, copy from "deltachat-ios/Info.plist", which is used on missing translations in "deltachat-ios/LANG.lproj/InfoPlist.strings" -->
-    <string name="InfoPlist_NSCameraUsageDescription">Delta Chat uses your camera to take and send photos and videos and to scan QR codes.</string>
-    <string name="InfoPlist_NSContactsUsageDescription">Delta Chat uses your contacts to show a list of addresses you can write to. Delta Chat has no server, your contacts are not sent anywhere.</string>
-    <string name="InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription">Delta Chat needs permission to share your location for the timespan you have enabled location sharing.</string>
-    <string name="InfoPlist_NSLocationWhenInUseUsageDescription">Delta Chat needs permission to share your location for the timespan you have enabled location sharing.</string>
-    <string name="InfoPlist_NSMicrophoneUsageDescription">Delta Chat uses your microphone to record and send voice messages and videos with sound.</string>
-    <string name="InfoPlist_NSPhotoLibraryUsageDescription">Delta Chat will let you choose which photos from your library to send.</string>
-    <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">Delta Chat wants to save images to your photo library.</string>
-    <string name="InfoPlist_NSFaceIDUsageDescription">Delta Chat can use Face ID to protect your local profile, backup creation and second device setup.</string>
+    <string name="InfoPlist_NSCameraUsageDescription">Privitty Chat uses your camera to take and send photos and videos and to scan QR codes.</string>
+    <string name="InfoPlist_NSContactsUsageDescription">Privitty Chat uses your contacts to show a list of addresses you can write to. Privitty Chat has no server, your contacts are not sent anywhere.</string>
+    <string name="InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription">Privitty Chat needs permission to share your location for the timespan you have enabled location sharing.</string>
+    <string name="InfoPlist_NSLocationWhenInUseUsageDescription">Privitty Chat needs permission to share your location for the timespan you have enabled location sharing.</string>
+    <string name="InfoPlist_NSMicrophoneUsageDescription">Privitty Chat uses your microphone to record and send voice messages and videos with sound.</string>
+    <string name="InfoPlist_NSPhotoLibraryUsageDescription">Privitty Chat will let you choose which photos from your library to send.</string>
+    <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">Privitty Chat wants to save images to your photo library.</string>
+    <string name="InfoPlist_NSFaceIDUsageDescription">Privitty Chat can use Face ID to protect your local profile, backup creation and second device setup.</string>
 
 
     <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
@@ -1179,10 +1179,10 @@
     <string name="pref_reliable_service">Force Background Connection</string>
     <string name="pref_reliable_service_explain">Causes a permanent notification</string>
 
-    <string name="pref_background_notifications_rationale">To maintain connection and receive messages in the background, ignore battery optimizations in the next step.\n\nDelta Chat uses few resources and takes care not to drain your battery.</string>
+    <string name="pref_background_notifications_rationale">To maintain connection and receive messages in the background, ignore battery optimizations in the next step.\n\nPrivitty Chat uses few resources and takes care not to drain your battery.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
-    <string name="perm_enable_bg_reminder_title">Tap here to receive messages while Delta Chat is in the background.</string>
-    <string name="perm_enable_bg_already_done">You already allowed Delta Chat to receive messages in the background.\n\nIf messages still do not arrive in background, please also check your system settings.</string>
+    <string name="perm_enable_bg_reminder_title">Tap here to receive messages while Privitty Chat is in the background.</string>
+    <string name="perm_enable_bg_already_done">You already allowed Privitty Chat to receive messages in the background.\n\nIf messages still do not arrive in background, please also check your system settings.</string>
 
     <!-- device messages for updates -->
     <string name="update_1_50_android">What\'s new?\n\n❤️‍🔥 New emojis picker with more emoji\n\n🎮 Enhanced in-chat apps: Get notifications and open supporting apps in context, i.e. open an added calendar entry directly\n\n👍 Get notified about reactions to your messages\n\n... 🛠️ FIXES and EVEN MORE at %1$s</string>
diff --git a/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx b/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx
index 2f71144f..d13e91ae 100644
--- a/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx
+++ b/packages/frontend/src/components/dialogs/FileAccessStatusDialog.tsx
@@ -390,8 +390,15 @@ export default function FileAccessStatusDialog({
   }
 
   const getDisplayFileName = (): string => {
-    const name = fileName || (filePath ? basename(filePath) : 'File')
-    return name.replace(/\.prv$/, '')
+    let rawName = 'File'
+
+    if (typeof fileName === 'string' && fileName.trim()) {
+      rawName = fileName
+    } else if (filePath) {
+      rawName = basename(filePath)
+    }
+
+    return rawName.replace(/\.prv$/, '')
   }
 
   const UserCard = ({
diff --git a/packages/frontend/src/components/message/Message.tsx b/packages/frontend/src/components/message/Message.tsx
index 2cc14532..5ff1223d 100644
--- a/packages/frontend/src/components/message/Message.tsx
+++ b/packages/frontend/src/components/message/Message.tsx
@@ -13,8 +13,6 @@ import { C, T } from '@deltachat/jsonrpc-client'
 import MessageBody from './MessageBody'
 import MessageMetaData, { isMediaWithoutText } from './MessageMetaData'
 import {
-  onDownload,
-  openAttachmentInShell,
   openForwardDialog,
   openMessageInfo,
   setQuoteInDraft,
@@ -25,7 +23,6 @@ import {
   enterEditMessageMode,
 } from './messageFunctions'
 import Attachment from '../attachment/messageAttachment'
-import { isGenericAttachment, isImage } from '../attachment/Attachment'
 import { runtime } from '@deltachat-desktop/runtime-interface'
 import { AvatarFromContact } from '../Avatar'
 import { ConversationType } from './MessageList'
@@ -246,32 +243,6 @@ const ForwardedTitle = ({
   )
 }
 
-async function showFileRecall(message: T.Message): Promise<boolean> {
-  if (
-    message.file &&
-    message.fileName &&
-    message.fromId === C.DC_CONTACT_ID_SELF &&
-    !message.isForwarded
-  ) {
-    const response = await runtime.PrivittySendMessage('sendEvent', {
-      event_type: 'getFileAccessStatus',
-      event_data: {
-        chat_id: String(message.chatId),
-        file_path: message.file,
-      },
-    })
-    const jsonresp = JSON.parse(response)
-    if (jsonresp?.result?.data?.status === 'active') {
-      return Promise.resolve(true)
-    } else {
-      console.log('file cannot be recalled:')
-    }
-    return Promise.resolve(false)
-  } else {
-    return Promise.resolve(false)
-  }
-}
-
 async function showFileForward(message: T.Message): Promise<boolean> {
   if (message.file && message.fileName) {
     if (message.fromId === C.DC_CONTACT_ID_SELF) {
@@ -384,9 +355,7 @@ async function buildContextMenu(
     copy_item = false
   }
 
-  const showAttachmentOptions = !!message.file
   const showCopyImage = !!message.file && message.viewType === 'Image'
-  const showResend = message.sender.id === C.DC_CONTACT_ID_SELF
 
   // Do not show "reply" in read-only chats
   const showReply = chat.canSend
@@ -403,7 +372,6 @@ async function buildContextMenu(
   // Do not show "react" for system messages
   const showSendReaction = showReactionsUi(message, chat)
   const showForward: boolean = await showFileForward(message)
-  const showRecallMsg: boolean = await showFileRecall(message)
 
   // Only show in groups, don't show on info messages or outgoing messages
   const showReplyPrivately =
@@ -466,7 +434,7 @@ async function buildContextMenu(
       rightIcon: 'bookmark-filled',
     },
     // copy link
-    link !== '' &&
+    link !== '' && !message.file &&
       isLink && {
         label: tx('menu_copy_link_to_clipboard'),
         action: () => runtime.writeClipboardText(link),
@@ -737,47 +705,6 @@ async function getPrivittyReplacementTextForFirstTwo(
 }
 
 function getPrivittyReplacementText(message: T.Message): string {
-  if (message.isPrivittyMessage) {
-    if (message.subject.indexOf('new_peer_add') !== -1) {
-      message.text =
-        'Establishing guaranteed full control over your shared data, please wait ...'
-    } else if (
-      message.subject.indexOf('new_group_add') !== -1 ||
-      message.subject.indexOf('new_group_concluded') !== -1
-    ) {
-      message.text =
-        'This group is Privitty secure—take control and revoke data anytime.'
-    } else if (
-      message.subject.indexOf('new_peer_complete') !== -1 ||
-      message.subject.indexOf('new_peer_conclude') !== -1
-    ) {
-      message.text =
-        'You are Privitty secure—take control and revoke data anytime.'
-    } else if (message.subject.indexOf('forward_add_request') !== -1) {
-      message.text = 'A file has been forwarded to you.'
-    } else if (message.subject.indexOf('OTSP_SENT') !== -1) {
-      message.text = 'You granted viewing access.'
-    } else if (
-      message.subject.indexOf('SPLITKEYS_REQUEST') !== -1 ||
-      message.subject.indexOf('SPLITKEYS_REQUESTING') !== -1
-    ) {
-      message.text = 'Requesting access from the owner ...'
-    } else if (message.subject.indexOf('SPLITKEYS_RESPONSE') !== -1) {
-      message.text = 'Granted access.'
-    } else if (message.subject.indexOf('SPLITKEYS_REVOKED') !== -1) {
-      message.text = 'You revoked access'
-    } else if (message.subject.indexOf('SPLITKEYS_DELETED') !== -1) {
-      message.text = 'Requesting for a deleted message'
-    } else if (message.subject.indexOf('SPLITKEYS_UNDO_REVOKED') !== -1) {
-      message.text = 'You Undo revoke'
-    } else if (
-      message.subject.indexOf('relay_message') !== -1 ||
-      message.subject.indexOf('relay_request') !== -1 ||
-      message.subject.indexOf('relay_response') !== -1
-    ) {
-      message.text = 'relay_message'
-    }
-  }
   return message.text || ''
 }
 
@@ -1013,7 +940,6 @@ export default function Message(props: {
         MouseEvent
       >
     ) => {
-      if (message.isPrivittyMessage) return
       event.preventDefault() // prevent default runtime context menu from opening
       const chat = await BackendRemote.rpc.getFullChatById(
         accountId,
@@ -1142,7 +1068,7 @@ export default function Message(props: {
         // set message width which is used by reaction component
         // to adapt the number of visible reactions
         if (
-          (message.fileMime && isImage(message.fileMime)) ||
+          (message.fileMime) ||
           window.innerWidth < 900
         ) {
           // image messages have a defined width