diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 090e69f66..4609c7b9c 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -54,7 +54,7 @@
 	    /></div>
     <!-- separator line --><hr/>
     </div>
-    <textarea name="text" rows="30" var:value="text"/>
+    <textarea id="text" name="text" rows="30" var:value="text"/>
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
   </form>
 </var:component>
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 54846025a..686d5bdc0 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -1,4 +1,5 @@
 var contactSelectorAction = 'mailer-contacts';
+var signatureLength = 0;
 
 function onContactAdd() {
   var selector = null;
@@ -240,6 +241,16 @@ function clickedEditorSave(sender) {
   return false;
 }
 
+function onTextFocus() {
+  this.insertBefore(document.createTextNode("\r\n"),
+		    this.lastChild);
+  if (signatureLength > 0) {
+    var length = this.getValue().length - signatureLength - 1;
+    this.setSelectionRange(length, length);
+  }
+  Event.stopObserving(this, "focus", onTextFocus);
+}
+
 function initMailEditor() {
   var list = $("attachments");
   $(list).attachMenu("attachmentsMenu");
@@ -256,6 +267,14 @@ function initMailEditor() {
   var list = $("addressList");
   TableKit.Resizable.init(list, {'trueResize' : true, 'keepWidth' : true});
 
+  var textarea = $("text");
+  var textContent = textarea.getValue();
+  var sigLimit = textContent.lastIndexOf("--");
+  if (sigLimit > -1)
+    signatureLength = (textContent.length - sigLimit);
+  Event.observe(textarea, "focus",
+		onTextFocus.bindAsEventListener(textarea));
+
   onWindowResize(null);
   Event.observe(window, "resize", onWindowResize);
   Event.observe(window, "beforeunload", onMailEditorClose);