diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
index 691629c10..83f895d14 100644
--- a/application/views/system/messages/FAShtmlWriteTemplate.php
+++ b/application/views/system/messages/FAShtmlWriteTemplate.php
@@ -68,7 +68,7 @@
 								<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
 
 							</label>
-							<textarea id="bodyTextArea" name="body">
+							<textarea id="bodyTextArea" class="bodyTextArea" name="body">
 
 								<?php echo $body; ?>
 
@@ -180,7 +180,7 @@
 								</div>
 							</div>
 							<br>
-							<textarea id="tinymcePreview"></textarea>
+							<textarea id="tinymcePreview" class="tinymcePreview"></textarea>
 						</div>
 
 					<?php echo $recipients_ids; ?>
diff --git a/public/js/infocenter/messageList.js b/public/js/infocenter/messageList.js
index 6146c7639..f6eb6218a 100644
--- a/public/js/infocenter/messageList.js
+++ b/public/js/infocenter/messageList.js
@@ -15,6 +15,7 @@ var MessageList = {
 			statusbar: false,
 			plugins: "autoresize",
 			autoresize_bottom_margin: 10,
+			max_height:495,
 			autoresize_min_height: 140,
 			autoresize_max_height: 495,
 			//callback to avoid conflict with ajax (for getting body of first message)
diff --git a/public/js/messaging/fasMessageWrite.js b/public/js/messaging/fasMessageWrite.js
index d32f80fac..ee480eb31 100644
--- a/public/js/messaging/fasMessageWrite.js
+++ b/public/js/messaging/fasMessageWrite.js
@@ -47,7 +47,21 @@ $(document).ready(function ()
 
 	tinymce.init({
 		theme : "advanced",
-		mode : "textareas"
+		mode : "specific_textareas",
+		editor_selector: "bodyTextArea",
+		theme_advanced_buttons2: "undo, redo, outdent, indent, bullist, numlist, link",
+		theme_advanced_buttons3: "",
+		theme_advanced_buttons4: "",
+		theme_advanced_toolbar_location: "top",
+		height: "400px",
+	});
+
+	tinymce.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "tinymcePreview",
+		height: 400,
+		readonly: 1,
 	});
 
 	if ($("#variables"))
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 382e79948..5132c0b7f 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -46,7 +46,10 @@ $(document).ready(function () {
 
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
+		plugins: "link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		min_height: 400,
+		max_height: 700,
 		autoresize_on_init: false,
 		autoresize_min_height: 400,
 		autoresize_max_height: 400,
@@ -61,6 +64,8 @@ $(document).ready(function () {
 		toolbar: false,
 		statusbar: false,
 		readonly: 1,
+		min_height: 400,
+		max_height: 700,
 		autoresize_on_init: false,
 		autoresize_min_height: 400,
 		autoresize_max_height: 700,
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
index c6401ded2..318a83280 100644
--- a/public/js/messaging/messageWriteReply.js
+++ b/public/js/messaging/messageWriteReply.js
@@ -6,7 +6,9 @@ $(document).ready(function ()
 {
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		max_height: 600,
 		autoresize_min_height: 150,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10,
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
index b4b1573a2..d38365467 100644
--- a/public/js/messaging/read.js
+++ b/public/js/messaging/read.js
@@ -220,6 +220,7 @@ $(document).ready(function () {
 		statusbar: false,
 		readonly: 1,
 		autoresize_min_height: 300,
+		max_height: 600,
 		autoresize_bottom_margin: 0
 	});
 
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
index bff451c2e..46336b8eb 100644
--- a/public/js/messaging/write.js
+++ b/public/js/messaging/write.js
@@ -62,7 +62,10 @@ $(document).ready(function () {
 	//
 	tinymce.init({
 		selector: "#body",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		min_height: 300,
+		max_height: 600,
 		autoresize_min_height: 300,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10
diff --git a/public/js/messaging/writeReply.js b/public/js/messaging/writeReply.js
index c78748889..df195d20f 100644
--- a/public/js/messaging/writeReply.js
+++ b/public/js/messaging/writeReply.js
@@ -37,7 +37,9 @@ $(document).ready(function () {
 	//
 	tinymce.init({
 		selector: "#body",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		max_height: 600,
 		autoresize_min_height: 150,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10