diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9d31d5f9..b6e9a2859 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-open-at-point): Also check for text property
+	org-linked-text before offering collected links.
+
 2010-02-03  Stephen Eglen  <stephen@gnu.org>
 
 	* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
diff --git a/lisp/org.el b/lisp/org.el
index f196a4412..cb91ae365 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8388,7 +8388,8 @@ application the system uses for this file type."
 	       (concat org-plain-link-re "\\|"
 		       org-bracket-link-regexp "\\|"
 		       org-angle-link-re "\\|"
-		       "[ \t]:[^ \t\n]+:[ \t]*$"))))
+		       "[ \t]:[^ \t\n]+:[ \t]*$")))
+	 (not (get-text-property (point) 'org-linked-text)))
     (or (org-offer-links-in-entry in-emacs)
 	(progn (require 'org-attach) (org-attach-reveal 'if-exists))))
    ((org-at-timestamp-p t) (org-follow-timestamp-link))