--- orig/planner-gnus.el
+++ mod/planner-gnus.el
@@ -97,20 +97,30 @@
        (if (= 1 (length articles))
 	   (let ((headers (gnus-data-header (assq (car articles)
 						  gnus-newsgroup-data))))
-	     (concat "E-Mail "		   
-		     (if (and planner-ignored-from-addresses
-			      (mail-header-from headers)
-			      (string-match planner-ignored-from-addresses
-					    (mail-header-from headers))
-                              (assq 'To
-						   (mail-header-extra headers)))
-			 ;; Mail from me, so use the To: instead
-			 (concat "to " (planner-get-name-from-address
-					(cdr (assq 'To
-						   (mail-header-extra headers)))))
-		       ;; Mail to me, so use the From:
-		       (concat "from " (planner-get-name-from-address
-					(mail-header-from headers))))))
+	     (if (assq 'Newsgroups (mail-header-extra headers))
+		 (concat "Post "
+			 (if (and planner-ignored-from-addresses
+				  (string-match
+				   planner-ignored-from-addresses (mail-header-from headers)))
+			     ""
+			   (concat "from "
+				   (planner-get-name-from-address from)))
+			 "on "
+			 (cdr (assq 'Newsgroups (mail-header-extra headers))))
+	       (concat "E-Mail "		   
+		       (if (and planner-ignored-from-addresses
+				(mail-header-from headers)
+				(string-match planner-ignored-from-addresses
+					      (mail-header-from headers))
+				(assq 'To
+				      (mail-header-extra headers)))
+			   ;; Mail from me, so use the To: instead
+			   (concat "to " (planner-get-name-from-address
+					  (cdr (assq 'To
+						     (mail-header-extra headers)))))
+			 ;; Mail to me, so use the From:
+			 (concat "from " (planner-get-name-from-address
+					  (mail-header-from headers)))))))
 	 (concat (number-to-string (length articles))
 		 " E-Mails from folder " gnus-newsgroup-name))))))
 
@@ -121,22 +131,33 @@
             (equal major-mode 'gnus-original-article-mode))
     (gnus-copy-article-buffer)
     (with-current-buffer gnus-article-copy
-      (let ((from (planner-gnus-get-address "From")))
+      (let ((from (planner-gnus-get-address "From"))
+	    (newsgroups (planner-gnus-get-address "Newsgroups")))
         (planner-make-link
          (concat "gnus://" gnus-newsgroup-name "/"
                  (planner-gnus-get-message-id))
-         (concat "E-Mail "
-                 (let ((to-addr 
-                        (planner-gnus-get-address "To")))
-                   (if (and planner-ignored-from-addresses
-                            from
-                            to-addr
-                            (string-match
-                             planner-ignored-from-addresses from))
-                       (concat "to " (planner-get-name-from-address
-                                      to-addr))
-                     (concat "from " (planner-get-name-from-address
-                                      from))))))))))
+	 (if newsgroups
+	     (concat "Post "
+		     (if (and planner-ignored-from-addresses
+			      (string-match
+			       planner-ignored-from-addresses from))
+			 ""
+		       (concat "from "
+			       (planner-get-name-from-address from)))
+		     "on "
+		     newsgroups)
+	   (concat "E-Mail "
+		   (let ((to-addr 
+			  (planner-gnus-get-address "To")))
+		     (if (and planner-ignored-from-addresses
+			      from
+			      to-addr
+			      (string-match
+			       planner-ignored-from-addresses from))
+			 (concat "to " (planner-get-name-from-address
+					to-addr))
+		       (concat "from " (planner-get-name-from-address
+					from)))))))))))
 
 ;;;###autoload
 (defun planner-gnus-annotation ()