diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less
index 3c2ce061..e649f9bf 100644
--- a/modules/forums/client/less/forum.less
+++ b/modules/forums/client/less/forum.less
@@ -571,8 +571,8 @@
     textarea {
         font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
         background-color: #fff;
-        min-height: 300px;
-        max-height: 800px;
+        min-height: 200px;
+        max-height: 600px;
         padding: 5px;
     }
     .md-preview {
diff --git a/modules/messages/client/controllers/admin-messages.client.controller.js b/modules/messages/client/controllers/admin-messages.client.controller.js
index 947292dc..0294e053 100644
--- a/modules/messages/client/controllers/admin-messages.client.controller.js
+++ b/modules/messages/client/controllers/admin-messages.client.controller.js
@@ -15,6 +15,29 @@
     vm.user = Authentication.user;
     vm.messageType = 'system';
 
+    /**
+     * initComplete
+     */
+    vm.initComplete = function () {
+      $('.message-textarea').textcomplete([
+        { // emoji strategy
+          match: /\B:([\-+\w]*)$/,
+          search: function (term, callback) {
+            callback($.map(window.emojies, function (emoji) {
+              return emoji.indexOf(term) === 0 ? emoji : null;
+            }));
+          },
+          template: function (value) {
+            return '<img class="ac-emoji" src="/graphics/emojis/' + value + '.png" />' + '<span class="ac-emoji-text">' + value + '</span>';
+          },
+          replace: function (value) {
+            return ':' + value + ': ';
+          },
+          index: 1
+        }
+      ]);
+    };
+
     /**
      * sendMessage
      * @param isValid
diff --git a/modules/messages/client/less/message.less b/modules/messages/client/less/message.less
index 09d65384..64f97c83 100644
--- a/modules/messages/client/less/message.less
+++ b/modules/messages/client/less/message.less
@@ -48,9 +48,10 @@
         width: 30px;
     }
     .message-title {
-        font-weight: bold;
-        font-size: 14px;
-        word-break: break-all;
+        font-size: 18px;
+        margin: 5px 0;
+        width: max-content;
+        border-bottom: double #aaa;
     }
     .message-info {
         font-size: 12px;
diff --git a/modules/messages/client/views/admin-send.client.view.html b/modules/messages/client/views/admin-send.client.view.html
index 4e82f4c2..6c9d2e5e 100644
--- a/modules/messages/client/views/admin-send.client.view.html
+++ b/modules/messages/client/views/admin-send.client.view.html
@@ -33,13 +33,13 @@
                             </dd>
                         </div>
 
-                        <div class="margin-bottom-10 form-group" show-errors>
+                        <div class="margin-bottom-10 form-group" ng-init="vm.initComplete();" show-errors>
                             <dt class="h-line">{{ 'MESSAGES_FIELD.CONTENT' | translate}}</dt>
                             <dd class="h-line">
-                                <textarea class="form-control message-textarea" id="content" name="content"
-                                          ng-model="vm.messageFields.content" required></textarea>
+                                <textarea id="messageContent" name="messageContent" class="form-control message-textarea" ng-model="vm.messageFields.content"
+                                      mt-markdown-editor="messageContent" required></textarea>
 
-                                <div ng-messages="vm.messageForm.content.$error" role="alert">
+                                <div ng-messages="vm.messageForm.messageContent.$error" role="alert">
                                     <p class="help-block error-text" ng-message="required">{{ 'MESSAGES_FIELD.CT_REQUIRED' | translate}}</p>
                                 </div>
 
@@ -85,7 +85,7 @@
                     <tbody>
                         <tr class="message-item" ng-repeat="m in vm.adminMessages">
                             <td>
-                                <h5 ng-bind="m.title"></h5>
+                                <div class="message-title text-long"><span ng-bind="m.title"></span></div>
 
                                 <p class="message-content" ng-bind-html="vm.getContentMarked(m);"></p>
 
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 573f3d88..8ae15771 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -33,6 +33,9 @@
     vm.searchTags = [];
     vm.progress = 0;
 
+    /**
+     * initComplete
+     */
     vm.initComplete = function () {
       $('.new_comment_textarea').textcomplete([
         { // emoji strategy