Merge commit 'faf966b6b5921074da6b99477e1f0bea29b45f6f'

diff --combined packages/gnorb/gnorb-gnus.el
index a77a7ed5319661e0e0725ec099ddfb30322e8085,e425ca2ffd9f56f5a88afd87f780abf7f5964956..e425ca2ffd9f56f5a88afd87f780abf7f5964956
--- 1/packages/gnorb/gnorb-gnus.el
--- 2/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
@@@ -309,10 -309,7 +309,7 @@@ information about the outgoing message 
                         'gnorb-org-restore-after-send t))
        (setq gnorb-message-org-ids nil)))))
  
- ;; This sets the global value, but the hook is made buffer-local in
- ;; `gnus-inews-add-send-actions', so this is ignored
- ;(add-hook 'message-header-hook 'gnorb-gnus-check-outgoing-headers)
- (add-hook 'message-send-hook 'gnorb-gnus-check-outgoing-headers t)
+ (add-hook 'message-sent-hook 'gnorb-gnus-check-outgoing-headers t)
  
  ;;;###autoload
  (defun gnorb-gnus-outgoing-do-todo (&optional arg)
@@@ -628,6 -625,8 +625,8 @@@ reply.
         (targ (car-safe related-headings)))
      (if targ
        (let ((ret (make-marker)))
+         (setq gnorb-window-conf (current-window-configuration))
+         (move-marker gnorb-return-marker (point))
          ;; Assume the first heading is the one we want.
          (gnorb-registry-make-entry
           msg-id from subject targ group)

diff --combined packages/gnorb/gnorb-org.el
index 339211172708b269cb520701378bdaebae83b42a,99e52475a7468ad90689d4c4919fd3cfd855bade..78d636bc6c0c20204e8333737cfb7c8037d7df73
--- 1/packages/gnorb/gnorb-org.el
--- 2/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@@ -164,7 -164,7 +164,7 @@@ we came from.
                 :raw-value
                 head)
                strings)
-         (org-element-map tree 'paragraph
+         (org-element-map tree '(paragraph drawer)
            (lambda (p)
              (push (org-element-interpret-data p)
                    strings))
@@@ -507,8 -507,7 +507,8 @@@ default set of parameters.
           "Export backend: "
           (mapcar (lambda (b)
                     (symbol-name (org-export-backend-name b)))
 -                 org-export--registered-backends) nil t))
 +                 org-export--registered-backends)
 +           nil t))
         (backend-symbol (intern backend-string))
         (f-or-t (org-completing-read "Export as file or text? "
                                      '("file" "text") nil t))

diff --combined packages/gnorb/gnorb.el
index ead6ac3886e698ad28739abf75b155c291c73e07,63124d934eeea4a46d457c0b4a3ff7f137560605..d2800f0a4eb3c0cede7286ae01dd8acc3ec7db2c
--- 1/packages/gnorb/gnorb.el
--- 2/gnorb.el
+++ b/packages/gnorb/gnorb.el
@@@ -2,7 -2,7 +2,7 @@@
  
  ;; Copyright (C) 2014  Free Software Foundation, Inc.
  
- ;; Version: 1.1.0
+ ;; Version: 1.1.1
  ;; Package-Requires: ((cl-lib "0.5"))
  
  ;; Maintainer: Eric Abrahamsen <eric@ericabrahamsen.net>
@@@ -40,5 -40,6 +40,5 @@@
  (with-eval-after-load 'org
    (require 'gnorb-org))
  
 -
  (provide 'gnorb)
  ;;; gnorb.el ends here