4 files changed, 24 insertions, 18 deletions
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index 062710f1d..bb89c96ec 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,6 +1,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
+		<a class="btn btn-xs btn-danger pull-right" href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
 		<h2>{{$prvmsg_header}}</h2>
+
 	</div>
 	<div class="section-content-wrapper">
 		{{foreach $mails as $mail}}
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
index 7bc854fff..d52fa40e0 100755
--- a/view/tpl/mail_head.tpl
+++ b/view/tpl/mail_head.tpl
@@ -1,10 +1,8 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<h2>{{$header}}</h2>
-	</div>
-	<div class="section-content-wrapper">
-		{{foreach $messages as $message}}
-			{{include file="mail_list.tpl"}}
-		{{/foreach}}
-	</div>
+<div class="widget">
+	<h3>{{$header}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+	{{foreach $messages as $message}}
+		{{include file="mail_list.tpl"}}
+	{{/foreach}}
+	</ul>
 </div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index e3f8ef75c..ad042eb59 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,6 +1,7 @@
-<a href="{{$message.from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$message.from_photo}}" alt="{{$message.from_name}}" /></a>
-<span class="mail-list">{{$message.from_name}}</span>
-<span class="mail-list {{if $message.seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$message.id}}" class="mail-link">{{$message.subject}}</a></span>
-<span class="mail-list" title="{{$message.date}}">{{$message.date}}</span>
-<span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$message.id}}" onclick="return confirmDelete();"  title="{{$message.delete}}"  class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span>
-<div class="clear"></div>
+<li>
+	<a href="mail/{{$message.id}}" class="mail-link">
+		<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
+		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
+		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
+	</a>
+</li>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 3e32eae14..954ada215 100755
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -1,13 +1,18 @@
 <div class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-		<li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li>
-		<li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li>
+		<li><a href="{{$check.url}}"{{if $check.sel}} class="active"{{/if}}>{{$check.label}}</a></li>
+	{{*
+		<li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li>
+		<li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li>
+		<li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li>
+	*}}
+		<li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li>
 	</ul>
 	{{if $tabs}}
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $tabs as $t}}
-			<li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li>
+			<li><a href="{{$t.url}}"{{if $t.sel}} class="active"{{/if}}>{{$t.label}}</a></li>
 		{{/foreach}}
 	</ul>
 	{{/if}}