--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Sun Feb 03 23:04:12 2013 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Mon Feb 04 00:35:50 2013 -0500
@@ -319,6 +319,14 @@
+ } else if (inChar == NSEnterCharacter || inChar == NSCarriageReturnCharacter) { + //Make shift+enter work the same as option+enter + if (flags & NSShiftKeyMask) { + [super insertLineBreak:self]; + [super keyDown:inEvent];