diff --git a/NewMessageWindow.m b/NewMessageWindow.m
index 0fa4fa8..98d56c1 100644
--- a/NewMessageWindow.m
+++ b/NewMessageWindow.m
@@ -143,6 +143,9 @@
     if (commandSelector == @selector(insertNewline:)) {
         retval = YES; // causes Apple to NOT fire the default enter action
         textField.stringValue = [NSString stringWithFormat:@"%@\n", textField.stringValue];
+
+        [[[textField window] fieldEditor:YES forObject:nil] scrollRangeToVisible:NSMakeRange([[textField stringValue] length], 0)];
+        [[[textField window] fieldEditor:YES forObject:nil] setSelectedRange:NSMakeRange([[textField stringValue] length], 0)];
     }
     
     if (commandSelector == @selector(noop:)) {