diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b48e8091804..5011b176df6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-18  Gerd Moellmann  <gerd@gnu.org>
+
+	* net/goto-addr.el (goto-address-at-point): Deal with URLs
+	part of which look like email addresses.
+
 2001-05-18  Andrew Innes  <andrewi@gnu.org>
 
 	* makefile.w32-in (compile-files-CMD, bootstrap-clean-CMD): Use
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 986489bdd62..bb75508935f 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -201,7 +201,12 @@ there, then load the URL at or before point."
   (interactive)
   (save-excursion
     (let ((address (save-excursion (goto-address-find-address-at-point))))
-      (if address
+      (if (and address 
+	       (save-excursion
+		 (goto-char (previous-single-char-property-change
+			     (point) 'goto-address nil
+			     (line-beginning-position)))
+		 (not (looking-at goto-address-url-regexp))))
 	  (compose-mail address)
 	(let ((url (browse-url-url-at-point)))
 	  (if url