diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index 404144572..744510e58 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -201,11 +201,11 @@ Element.addMethods({
 
   setCaretTo: function(element, pos) { 
     element = $(element);
-    if (element.selectionStart) { // For Mozilla and Safari
+    if (element.selectionStart) {        // For Mozilla and Safari
       element.focus(); 
       element.setSelectionRange(pos, pos); 
     }
-    else if (element.createTextRange) {       // For IE
+    else if (element.createTextRange) {  // For IE
       var range = element.createTextRange(); 
       range.move("character", pos); 
       range.select();
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index ba470c44c..ed5796366 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -256,7 +256,7 @@ function onTextFocus() {
   }
   if (signatureLength > 0) {
     var length = this.getValue().length - signatureLength - 1;
-    this.selectText(length, length);
+    this.setCaretTo(length);
   }
   Event.stopObserving(this, "focus", onTextFocus);
 }
@@ -282,8 +282,8 @@ function initMailEditor() {
   var sigLimit = textContent.lastIndexOf("--");
   if (sigLimit > -1)
     signatureLength = (textContent.length - sigLimit);
+  textarea.scrollTop = textarea.scrollHeight;
   textarea.observe("focus", onTextFocus);
-  textarea.scrollTop = textarea.offsetHeight;
 
   onWindowResize(null);
   Event.observe(window, "resize", onWindowResize);