From f299176e7efc378d9945c78b6a1ec1900e0c2b2c Mon Sep 17 00:00:00 2001
From: Jeena Paradies <spam@jeenaparadies.net>
Date: Fri, 9 Nov 2012 22:42:57 +0100
Subject: [PATCH] fixes #18

---
 Mac/Controller.m       |  1 +
 Mac/NewMessageWindow.m | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Mac/Controller.m b/Mac/Controller.m
index 01766d3..0d6ce00 100644
--- a/Mac/Controller.m
+++ b/Mac/Controller.m
@@ -323,6 +323,7 @@
     NSString *js = [NSString stringWithFormat:@"tentia_instance.showStatus('%@', '%@');", postId, entity];
     [conversationView stringByEvaluatingJavaScriptFromString:js];
     [conversationViewWindow makeKeyAndOrderFront:self];
+    conversationViewWindow.title = @"Test";
 }
 
 /* CARBON */
diff --git a/Mac/NewMessageWindow.m b/Mac/NewMessageWindow.m
index 98d56c1..f065e5f 100644
--- a/Mac/NewMessageWindow.m
+++ b/Mac/NewMessageWindow.m
@@ -141,11 +141,20 @@
     BOOL retval = NO;
     
     if (commandSelector == @selector(insertNewline:)) {
-        retval = YES; // causes Apple to NOT fire the default enter action
-        textField.stringValue = [NSString stringWithFormat:@"%@\n", textField.stringValue];
+        
+        NSText *text = [[textField window] fieldEditor:YES forObject:nil];
+        
+        NSRange range = [text selectedRange];
+        NSString *stringBefore = [textField.stringValue substringToIndex:range.location];
+        NSString *stringAfter =  [textField.stringValue substringFromIndex:range.location + range.length];
+        
+        textField.stringValue = [NSString stringWithFormat:@"%@\n%@", stringBefore, stringAfter];
 
-        [[[textField window] fieldEditor:YES forObject:nil] scrollRangeToVisible:NSMakeRange([[textField stringValue] length], 0)];
-        [[[textField window] fieldEditor:YES forObject:nil] setSelectedRange:NSMakeRange([[textField stringValue] length], 0)];
+        NSRange r = NSMakeRange(range.location + 1, 0);
+        [text scrollRangeToVisible:r];
+        [text setSelectedRange:r];
+
+        retval = YES; // causes Apple to NOT fire the default enter action
     }
     
     if (commandSelector == @selector(noop:)) {