diff --git a/ChangeLog b/ChangeLog
index fd8ce829c..46c9760da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-26  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSTextView.m (-mouseDown:): Use container origin for
+	attachment cells.
+
 2013-10-26  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSMenuView.m (-heightForItem:): Use
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index a48d43acb..a8c40713f 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -5573,12 +5573,14 @@ other than copy/paste or dragging. */
 		  cellFrame.origin =
 		    [_layoutManager
 		      locationForGlyphAtIndex: glyphIndex];
+		  cellFrame.origin.x += lfRect.origin.x;
+		  cellFrame.origin.y += lfRect.origin.y;
+                  cellFrame.origin.x += _textContainerOrigin.x;
+                  cellFrame.origin.y += _textContainerOrigin.y;
 		  cellFrame.size =
 		    [_layoutManager 
 		      attachmentSizeForGlyphAtIndex: glyphIndex];
 		  cellFrame.origin.y -= cellFrame.size.height;
-		  cellFrame.origin.x += lfRect.origin.x;
-		  cellFrame.origin.y += lfRect.origin.y;
 
 		  /* TODO: What about the insertion point ? */
 		  if ([cell wantsToTrackMouseForEvent: theEvent