diff --git a/css/style.css b/css/style.css
index 834e7505c..9fa182ded 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1701,6 +1701,42 @@ ul.viewcontact_wrapper > li {
 }
 
 /* private mail */
+.mail-thread {
+    max-height: calc(100vh - 200px);
+}
+#mail-conversation {
+    overflow-y: auto;
+    max-height: calc(100vh - 400px);
+    max-height: auto;
+    /*height: 500px;*/
+    margin-bottom: 0px;
+}
+#mail-conversation.can-reply {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+.mail-conv-wrapper .media .contact-photo-wrapper {
+    height: 48px;
+    width: 48px;
+}
+.mail-thread #prvmail-to-label,
+.mail-thread #prvmail-subject-label {
+    display: none;
+}
+.mail-thread #prvmail-message-label > label {
+    display:none;
+}
+.mail-thread #prvmail-message-label textarea {
+    border-top: none;
+    margin-top: -10px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    max-height: 120px;
+}
+.mail-conv-wrapper {
+    padding: 15px;
+    border-bottom: 1px solid rgba(238, 238, 238, 0.95)
+}
 #prvmail-end {
     clear:both;
 }
diff --git a/templates/mail_conv.tpl b/templates/mail_conv.tpl
new file mode 100644
index 000000000..dd091249a
--- /dev/null
+++ b/templates/mail_conv.tpl
@@ -0,0 +1,21 @@
+<div id="mail_conv-{{$mail.id}}" class="mail-conv-wrapper message-{{$mail.id}}">
+	<div class="media">
+		<div class="pull-left contact-photo-wrapper">
+			<a href="{{$mail.from_url}}">
+				<img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" />
+			</a>
+		</div>
+		<div class="media-body">
+			<div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div>
+			<div class="mail-conv-delete-end"></div>
+			<h4 class="media-heading"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></h4>
+
+			<div class="mail-body">
+				{{$mail.body}}
+			</div>
+			{{*<a href="message/dropconv/{{$mail.id}}" onclick="return confirmDelete();" title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a> *}}
+		</div>
+	</div>
+	<div class="mail-conv-wrapper-end"></div>
+</div>
+
diff --git a/templates/mail_display.tpl b/templates/mail_display.tpl
new file mode 100644
index 000000000..fc8817dd3
--- /dev/null
+++ b/templates/mail_display.tpl
@@ -0,0 +1,19 @@
+
+<div id="mail-thread-{{$thread_id}}" class="mail-thread">
+	{{$brauchenwas}}
+	<h4 class="headding">{{$thread_subject}}</h3>
+
+	<div id="mail-conversation" class="panel panel-default {{if $canreply }}can-reply{{/if}}">
+	{{foreach $mails as $mail}}
+		{{include file="mail_conv.tpl"}}
+	{{/foreach}}
+	</div>
+
+	<div id="mail-reply">
+	{{if $canreply}}
+		{{include file="prv_message.tpl"}}
+	{{else}}
+		{{$unknown_text}}
+	{{/if}}
+	</div>
+</div>
diff --git a/templates/mail_list.tpl b/templates/mail_list.tpl
new file mode 100644
index 000000000..18a2acc96
--- /dev/null
+++ b/templates/mail_list.tpl
@@ -0,0 +1,30 @@
+<div class="mail-list-outside-wrapper">
+	
+
+		
+	<div class="media">
+		<div class="media-left">
+			<a href="{{$from_url}}">
+				<img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" style="min-width:80px; min-height:80px; width:80px; height:80px; max-width:80px; max-height:80px;" />
+			</a>
+		</div>
+		<div class="media-body">
+			<div class="text-muted time ago pull-right" title="{{$date}}">{{$ago}}</div>
+			
+			<h5 class="media-heading">{{$from_name}}</h5>
+			<a href="message/{{$id}}">
+				<h4>{{$subject}}</h4>
+			</a>
+			<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a>
+			<p class="text-muted">{{$count}}</p>
+		</div>
+
+	</div>
+
+
+	
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
+
diff --git a/templates/msg-header.tpl b/templates/msg-header.tpl
index 304b2ec17..6645a4a74 100644
--- a/templates/msg-header.tpl
+++ b/templates/msg-header.tpl
@@ -55,6 +55,11 @@ else
 		$("#comment-edit-text-input").bbco_autocomplete('bbcode');
 		{{/if}}
 
+		//var objDiv = document.getElementById("mail-conversation");
+		//objDiv.scrollTop = objDiv.scrollHeight;
+		$('#mail-conversation').perfectScrollbar();
+		$('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
+
 
 	});
 </script>
diff --git a/templates/prv_message.tpl b/templates/prv_message.tpl
index 82031291b..23f9dab2c 100644
--- a/templates/prv_message.tpl
+++ b/templates/prv_message.tpl
@@ -31,7 +31,7 @@
 		<textarea rows="8" cols="72" class="prvmail-text form-control" id="comment-edit-text-input" name="body" tabindex="12">{{$text}}</textarea>
 	</div>
 
-	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills pull-left">
+	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 				<li>
 					<a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
 						<i class="fa fa-picture-o"></i>