From be75ab66e20000eafee8c6ebe713e32804e70702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Sun, 29 Apr 2018 11:35:48 +0200
Subject: [PATCH] Display the message first instead of the status if there is
 one

---
 app/widgets/Chats/_chats_item.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/widgets/Chats/_chats_item.tpl b/app/widgets/Chats/_chats_item.tpl
index 53cf86d25..42384ec0c 100644
--- a/app/widgets/Chats/_chats_item.tpl
+++ b/app/widgets/Chats/_chats_item.tpl
@@ -45,13 +45,13 @@
             </span>
         {/if}
     </p>
-    {if="$roster && $roster->presence && $roster && $roster->presence->status"}
-        <p class="line">{$roster->presence->status}</p>
-    {elseif="isset($message)"}
+    {if="isset($message)"}
         {if="preg_match('#^\?OTR#', $message->body)"}
             <p><i class="zmdi zmdi-lock"></i> {$c->__('message.encrypted')}</p>
         {elseif="stripTags($message->body) != ''"}
             <p class="line">{$message->body|stripTags}</p>
         {/if}
+    {elseif="$roster && $roster->presence && $roster && $roster->presence->status"}
+        <p class="line">{$roster->presence->status}</p>
     {/if}
 </li>