-(defvar goto-address-url-regexp thing-at-point-url-regexp
-;;; (concat "\\b\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|"
-;;; "telnet\\|wais\\):\\(//[-a-zA-Z0-9_.]+:"
-;;; "[0-9]*\\)?[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*"
-;;; "[-a-zA-Z0-9_=#$@~`%&*+|\\/]")
+(defvar goto-address-url-regexp
+ (concat "\\<\\("
+ (mapconcat 'identity
+ (delete "mailto:" (copy-sequence thing-at-point-uri-schemes))
+ "\\|")
+ "\\)"
+ thing-at-point-url-path-regexp)
+ ;; (concat "\\b\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|"
+ ;; "telnet\\|wais\\):\\(//[-a-zA-Z0-9_.]+:"
+ ;; "[0-9]*\\)?[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*"
+ ;; "[-a-zA-Z0-9_=#$@~`%&*+|\\/]")