Fix unread message conversation title display

diff --git a/mod/message.php b/mod/message.php
index 9ef55fbfe83bf4f7eb478593e2a02f9159c91163..f36b3ffa3b9f5363aeab1c92f40a873fc6151eeb 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -499,7 +499,6 @@ function render_messages(array $msg, $t)
                        $participants = L10n::t("%s and You", $rr['from-name']);
                }
 
-               $subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
                $body_e = $rr['body'];
                $to_name_e = $rr['name'];
 
@@ -517,7 +516,7 @@ function render_messages(array $msg, $t)
                        '$from_addr' => defaults($contact, 'addr', ''),
                        '$sparkle' => ' sparkle',
                        '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
-                       '$subject' => $subject_e,
+                       '$subject' => $rr['title'],
                        '$delete' => L10n::t('Delete conversation'),
                        '$body' => $body_e,
                        '$to_name' => $to_name_e,

diff --git a/view/theme/frio/templates/mail_list.tpl b/view/theme/frio/templates/mail_list.tpl
index 4a797d47c0b760cb48aa3a51e18998457f51318f..bfc21aabaf1b56dbf4331cd8fe6e6323c40545f6 100644 (file)
--- a/view/theme/frio/templates/mail_list.tpl
+++ b/view/theme/frio/templates/mail_list.tpl
@@ -12,7 +12,16 @@
                                <div class="text-muted time ago pull-right" title="{{$date}}">{{$ago}}</div>
 
                                <h4 class="media-heading">{{$from_name}}</h4>
-                               <div class="mail-list-subject"><a href="message/{{$id}}">{{$subject}}</a></div>
+                               <div class="mail-list-subject">
+                                       <a href="message/{{$id}}">
+                                       {{if !$seen}}
+                                               <strong>
+                                       {{/if}}
+                                               {{$subject}}
+                                       {{if !$seen}}
+                                               </strong>
+                                       {{/if}}
+                                       </a></div>
                                <a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);">
                                <i class="faded-icon fa fa-trash"></i>
                                </a>