Fix message retractation display when encrypted

app/Widgets/Chat/chat.js

@@ -1114,7 +1114,7 @@ var Chat = {
         }
 
         // OMEMO handling
-        if (data.omemoheader && data.encrypted && OMEMO_ENABLED) {
+        if (data.omemoheader && data.encrypted && !data.retracted && OMEMO_ENABLED) {
             p.innerHTML = data.omemoheader.payload.substring(0, data.omemoheader.payload.length / 2);
             ChatOmemo.decrypt(data).then(plaintext => {
                 let refreshP = document.querySelector('#id' + data.id + ' p.encrypted');

app/Widgets/ChatActions/_chatactions_message.tpl

@@ -6,7 +6,7 @@
                 <span class="resource {$message->resolveColor()}">{$message->resource}</span>
             {/if}
             {if="$message->encrypted"}
-                <p class="encrypted">{$c->__('message.encrypted')} <i class="material-symbols fill">lock</i></p>
+                <p class="encrypted">{if="$message->retracted"}{$c->__('message.retracted')}{else}{$c->__('message.encrypted')}{/if} <i class="material-symbols fill">lock</i></p>
             {elseif="$message->retracted"}
                 <p class="retracted">{$c->__('message.retracted')} <i class="material-symbols">delete</i></p>
             {elseif="$message->file && $message->file->isPicture"}

app/Widgets/Chats/_chats_item.tpl

@@ -74,10 +74,10 @@
                 <i class="material-symbols icon green blink">phone_in_talk</i>
                 {$c->__('visio.in_call')} •
             {/if}
-            {if="$message->retracted"}
+            {if="$message->encrypted"}
+                <i class="material-symbols fill">lock</i> {if="$message->retracted"}{$c->__('message.retracted')}{else}{$c->__('message.encrypted')}{/if}
+            {elseif="$message->retracted"}
                 <i class="material-symbols">delete</i> {$c->__('message.retracted')}
-            {elseif="$message->encrypted"}
-                <i class="material-symbols fill">lock</i> {$c->__('message.encrypted')}
             {elseif="$message->type == 'invitation'"}
                 <i class="material-symbols icon gray">outgoing_mail</i> {$c->__('message.invitation')}
             {elseif="$message->type == 'jingle_incoming'"}

app/Widgets/ContactData/_contactdata.tpl

@@ -45,10 +45,10 @@
                     {$c->__('button.chat')}
                 </p>
                 {if="isset($message)"}
-                    {if="$message->retracted"}
+                    {if="$message->encrypted"}
+                        <p><i class="material-symbols fill">lock</i> {if="$message->retracted"}{$c->__('message.retracted')}{else}{$c->__('message.encrypted')}{/if}</p>
+                    {elseif="$message->retracted"}
                         <p><i class="material-symbols">delete</i> {$c->__('message.retracted')}</p>
-                    {elseif="$message->encrypted"}
-                        <p><i class="material-symbols">lock</i> {$c->__('message.encrypted')}</p>
                     {elseif="$message->file"}
                         <p>
                             {if="$message->jidfrom == $message->user_id"}