diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3607e554a..ca1ad0046 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-07  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* org-gnus.el (org-gnus-store-link): Require message.el in
+	org-gnus-store-link.
+
 2009-06-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-src.el: New file, split out of org.el
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 111a68f12..e1a6e3622 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -135,7 +135,10 @@ If `org-store-link' was called with a prefix arg the meaning of
 	   (newsgroups (mail-header 'newsgroups header))
 	   (x-no-archive (mail-header 'x-no-archive header))
 	   (subject (if (eq major-mode 'gnus-article-mode)
-			(message-fetch-field "subject")
+			(save-restriction
+			  (require 'message)
+			  (message-narrow-to-head-1)
+			  (message-fetch-field "subject"))
 		      (gnus-summary-subject-string)))
 	   desc link)
       (org-store-link-props :type "gnus" :from from :subject subject