--- org.el.orig	2007-07-13 15:10:47.000000000 +0200
+++ org.el	2007-07-18 17:33:21.000000000 +0200
@@ -10509,7 +10509,7 @@
 		   (format "http://groups.google.com/groups?as_umsgid=%s"
 			   (org-fixup-message-id-for-http message-id))))
 	  (setq link (org-make-link "gnus:" group
-				    "#" (number-to-string article))))))
+				    "#" (org-remove-angle-brackets message-id))))))
 
      ((eq major-mode 'w3-mode)
       (setq cpltxt (url-view-url t)
@@ -11444,8 +11444,14 @@
   (funcall (cdr (assq 'gnus org-link-frame-setup)))
   (if gnus-other-frame-object (select-frame gnus-other-frame-object))
   (cond ((and group article)
+	 (if (string-match "@" article)
+	     (when (boundp 'gnus-registry-alist)
+	       (gnus-registry-save)
+	       (setq group (caddr (assoc (concat "<" article ">")
+					 gnus-registry-alist))))
+	   (setq article (string-to-number article)))
 	 (gnus-group-read-group 1 nil group)
-	 (gnus-summary-goto-article (string-to-number article) nil t))
+	 (gnus-summary-goto-article article nil t))
 	(group (gnus-group-jump-to-group group))))
 
 (defun org-follow-vm-link (&optional folder article readonly)