diff --git a/Templates/Message/write.tpl b/Templates/Message/write.tpl
index 2d2013c9..6bf8604e 100644
--- a/Templates/Message/write.tpl
+++ b/Templates/Message/write.tpl
@@ -23,13 +23,13 @@ $user = $database->getUserArray($session->uid, 1);
 		}
 
 		function copyElement(element) {
-			if (element == 'receiver') {
+			/*if (element == 'receiver') {
 				document.getElementById('copy_receiver').value = document.getElementById('receiver').value;
 			} else if (element == 'subject') {
 				document.getElementById('copy_subject').value = document.getElementById('subject').value;
 			} else if (element == 'body') {
-				document.getElementById('copy_igm').value = document.getElementById('message').value;
-			}
+				document.getElementById('copy_img').value = document.getElementById('message').value;
+			}*/
 		}
 
 		function submitDefault (type,uid) {
@@ -73,7 +73,9 @@ echo "re1:".strip_tags($message->reply['topic']); }} ?>" maxlength="35" onkeyup=
 					<a href="javascript:void(0);" bbWin="resources" id="message_resourceButton"><div title="resources" alt="resources" class="bbButton bbResource"></div></a>
 					<a href="javascript:void(0);" bbWin="smilies" id="message_smilieButton"><div title="smilies" alt="smilies" class="bbButton bbSmilie"></div></a>
 					<a href="javascript:void(0);" bbWin="troops" id="message_troopButton"><div title="troops" alt="troops" class="bbButton bbTroop"></div></a>
-					<a href="javascript:void(0);" id="message_previewButton" bbArea="message"><div title="preview" alt="preview" class="bbButton bbPreview"></div></a>
+					<a href="javascript:void(0);" id="message_previewButton" bbArea="message">
+					<!--<div title="preview" alt="preview" class="bbButton bbPreview"></div>//-->
+					</a>
 					<div class="clear"></div>
 					<div id="message_toolbarWindows">
 						<div id="message_resources" name="message_resources"><a href="javascript:void(0);" bbType="o" bbTag="l" ><img src="img/x.gif" class="r1" title="Lumber" alt="Lumber" /></a><a href="javascript:void(0);" bbType="o" bbTag="cl" ><img src="img/x.gif" class="r2" title="Clay" alt="Clay" /></a><a href="javascript:void(0);" bbType="o" bbTag="i" ><img src="img/x.gif" class="r3" title="Iron" alt="Iron" /></a><a href="javascript:void(0);" bbType="o" bbTag="c" ><img src="img/x.gif" class="r4" title="Crop" alt="Crop" /></a></div>
diff --git a/new.js b/new.js
index f1797087..fabbc4ff 100644
--- a/new.js
+++ b/new.js
@@ -586,7 +586,7 @@ var BBEditor = new Class ({
 
 	showPreview: function(data) {
 
-		if (data.error == true) {
+		if (data && data.error == true) {
 
 			alert(data.errorMsg);
 
@@ -594,7 +594,7 @@ var BBEditor = new Class ({
 
 		} else {
 
-			this.preview.innerHTML = data.text;
+			this.preview.innerHTML = this.textArea.value;
 
 			this.preview.setStyle('display','block');