Index: custommemo.inc
===================================================================
--- custommemo.inc	(revision 46308)
+++ custommemo.inc	(working copy)
@@ -203,6 +203,17 @@
 end;
 
 {------------------------------------------------------------------------------
+  Prevents false firing of the OnEditingDone event if the memo accepts the
+  RETURN key for new-line input.
+ ------------------------------------------------------------------------------}
+procedure TCustomMemo.KeyUpAfterInterface(var Key: Word; Shift: TShiftState);
+begin
+  if (Key = VK_RETURN) and FWantReturns then
+    Key := 0;
+  inherited;
+end;
+
+{------------------------------------------------------------------------------
   Method: TCustomMemo.SetLines
   Params: 
   Returns: 

Index: include/custommemo.inc
===================================================================
--- include/custommemo.inc	(revision 46308)
+++ include/custommemo.inc	(working copy)
@@ -203,6 +203,17 @@
 end;
 
 {------------------------------------------------------------------------------
+  Prevents false firing of the OnEditingDone event if the memo accepts the
+  RETURN key for new-line input.
+ ------------------------------------------------------------------------------}
+procedure TCustomMemo.KeyUpAfterInterface(var Key: Word; Shift: TShiftState);
+begin
+  if (Key = VK_RETURN) and FWantReturns then
+    Key := 0;
+  inherited;
+end;
+
+{------------------------------------------------------------------------------
   Method: TCustomMemo.SetLines
   Params: 
   Returns: 
Index: stdctrls.pp
===================================================================
--- stdctrls.pp	(revision 46308)
+++ stdctrls.pp	(working copy)
@@ -816,6 +816,7 @@
     procedure RealSetText(const Value: TCaption); override;
     function GetCachedText(var CachedText: TCaption): boolean; override;
     function GetCaretPos: TPoint; override;
+    procedure KeyUpAfterInterface(var Key: Word; Shift: TShiftState); override;
     procedure SetCaretPos(const Value: TPoint); override;
     procedure SetLines(const Value: TStrings);
     procedure SetSelText(const Val: string); override;