diff --git a/css/style.css b/css/style.css
index bf279131a..33e2157b6 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1370,10 +1370,14 @@ blockquote.shared_content {
 }
 .comment-edit-submit-wrapper a,
 .comment-edit-submit-wrapper a:hover {
-    color: #555;
     padding-top: 5px !important;
     padding-bottom: 5px !important;
 }
+.comment-icon-list a.icon,
+.comment-icon-list a.icon:hover {
+    color: #555;
+    background-color: transparent;
+}
 
 /* acpopup  + textcompletion*/
 .acpopup {
@@ -1679,6 +1683,17 @@ ul.viewcontact_wrapper > li {
     padding-top: 10px;
 }
 
+/* private mail */
+#prvmail-end {
+    clear:both;
+}
+/* poke */
+#poke-desc {
+    margin: 5px 0 30px;
+}
+#poke-wrapper-end {
+    clear: both;
+}
 /*
 * Overwriting for transparency and other colors
 */
diff --git a/js/modal.js b/js/modal.js
index a27b3d166..888893e83 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -22,10 +22,10 @@ function loadModalTitle() {
 	//$("#modal-title").empty();
 
 	// hide the first h3 child element of the modal body
-	$("#modal-body > h3").first().hide();
+	$("#modal-body .headding").first().hide();
 
-	// get the text of the first h3 child element
-	var title = $("#modal-body > h3").first().text();
+	// get the text of the first element with headding class
+	var title = $("#modal-body .headding").first().text();
 
 	// and append it to modal title
 	if (title!=="") {
diff --git a/templates/comment_item.tpl b/templates/comment_item.tpl
index 4efa45b0d..b430ff7e6 100644
--- a/templates/comment_item.tpl
+++ b/templates/comment_item.tpl
@@ -71,9 +71,9 @@
 			{{if $preview}}
 				<button class="btn btn-defaul btn-sm" type="button" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
 			{{/if}}
-			<ul class="comment-edit-bb-{{$id}} nav nav-pills pull-right">
+			<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
 				<li>
-					<a style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}">
+					<a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}">
 						<i class="fa fa-picture-o"></i>
 					</a>
 				</li>
diff --git a/templates/msg-header.tpl b/templates/msg-header.tpl
new file mode 100644
index 000000000..304b2ec17
--- /dev/null
+++ b/templates/msg-header.tpl
@@ -0,0 +1,61 @@
+
+
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var plaintext = '{{$editselect}}';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		theme_advanced_resizing : true,
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		//force_p_newlines : false,
+		//force_br_newlines : true,
+		forced_root_block : 'div',
+		convert_urls: false,
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#comment-edit-text-input").editor_autocomplete(baseurl+"/acl");
+
+
+</script>
+
+<script>
+	$(document).ready(function() {
+		{{if $editselect = 'none'}}
+		$("#comment-edit-text-input").bbco_autocomplete('bbcode');
+		{{/if}}
+
+
+	});
+</script>
+
diff --git a/templates/poke_content.tpl b/templates/poke_content.tpl
new file mode 100644
index 000000000..3a01148af
--- /dev/null
+++ b/templates/poke_content.tpl
@@ -0,0 +1,47 @@
+
+<div id="poke-wrapper">
+
+	<h3 class="headding">{{$title}}</h3>
+	<div id="poke-desc">{{$desc}}</div>
+
+	<form id="poke-form" action="poke" method="get">
+
+		<div poke-content-wrapper
+
+
+
+			<div id="poke-recip-wrapper" class="form-group">
+				<label for="poke-recip">{{$clabel}}</label>
+				<input id="poke-recip" class="form-control" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
+				<input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
+				<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
+			</div>
+
+			<div id="poke-action-wrapper" class="form-group">
+				<label for="poke-verb-select">{{$choice}}</label>
+				<select name="verb" id="poke-verb-select" class="form-control">
+				{{foreach $verbs as $v}}
+				<option value="{{$v.0}}">{{$v.1}}</option>
+				{{/foreach}}
+				</select>
+			</div>
+
+			<div id="poke-private-desc" class="checkbox">
+				<input type="checkbox" id=poke-private-desc-checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
+				<label for="poke-private-desc-checkbox">{{$prv_desc}}</label>
+			</div>
+
+		</div>
+
+		<div id="poke-content-wrapper-end"></div>
+
+		<div id="poke-submit-wrapper">
+			<button class="btn btn-primary pull-right" type="submit" name="submit" value="{{$submit|escape:'html'}}"><i class="fa fa-slideshare"></i>&nbsp;{{$submit|escape:'html'}}</button>
+		</div>
+
+		<div id="poke-submit-wrapper-end"></div>
+
+
+	</form>
+	<div id="poke-wrapper-end"></div>
+</div>
diff --git a/templates/prv_message.tpl b/templates/prv_message.tpl
new file mode 100644
index 000000000..113ea5b58
--- /dev/null
+++ b/templates/prv_message.tpl
@@ -0,0 +1,86 @@
+
+<div id="prvmail-wrapper">
+<form id="prvmail-form" action="message" method="post" >
+	
+	{{* Disable the header. We will see if we will need it
+	<h3>{{$header}}</h3>
+	*}}
+
+	{{$parent}}
+
+	{{* The To: form-group which contains the message recipient *}}
+	<div id="prvmail-to-label" class="form-group">
+		<label for="message-to-select">{{$to}}</label><br>
+		{{if $showinputs}}
+		<input type="text" id="recip" class="form-control" name="messagerecip" value="{{$prefill}}" tabindex="10" {{if $prefill}}disabled{{else}}aria-required="true"{{/if}} />
+		<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+		{{else}}
+		{{$select}}
+		{{/if}}
+	</div>
+
+	{{* The subject input field *}}
+	<div id="prvmail-subject-label" class="form-group">
+		<label for="prvmail-subject">{{$subject}}</label>
+		<input type="text" id="prvmail-subject" class="form-control" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+	</div>
+
+	{{* The message input field which contains the message text *}}
+	<div id="prvmail-message-label" class="form-group">
+		<label for="prvmail-text">{{$yourmessage}}</label>
+		<textarea rows="8" cols="72" class="prvmail-text form-control" id="comment-edit-text-input" name="input" tabindex="12">{{$text}}</textarea>
+	</div>
+
+	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills 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>
+					</a>
+				</li>
+				<li>
+					<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input"">
+						<i class="fa fa-link"></i>
+					</a>
+				</li>
+				<li>
+					<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
+						<i class="fa fa-video-camera"></i>
+					</a>
+				</li>
+
+				<li>
+					<a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
+						<i class="fa fa-underline"></i>
+					</a>
+				</li>
+				<li>
+					<a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
+						<i class="fa fa-italic"></i>
+					</a>
+				</li>
+				<li>
+					<a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
+						<i class="fa fa-bold"></i>
+					</a>
+				</li>
+				<li>
+					<a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
+						<i class="fa fa-quote-left"></i>
+					</a>
+				</li>
+			</ul>
+	
+	<div id="prvmail-text-bb-end"></div>
+
+	{{* The submit button *}}
+	<div id="prvmail-submit-wrapper">
+		<button type="submit" id="prvmail-submit" name="submit" value="{{$submit|escape:'html'}}" class="btn btn-primary pull-right"  tabindex="13">
+			<i class="fa fa-slideshare fa-fw"></i>
+			{{$submit|escape:'html'}}
+		</button>
+	</div>
+
+	<div id="prvmail-end"></div>
+
+</form>
+</div>