--- a/.emacs-my	Thu Mar 03 11:57:25 2011 +0200
+++ b/.emacs-my	Thu Mar 03 12:02:07 2011 +0200
@@ -861,27 +861,12 @@
 
 (when (>= emacs-major-version 23)
   (require 'remember))
-(when
-    (or (featurep 'remember) (fboundp 'remember))
-  (progn
-    (setq remember-annotation-functions '(org-remember-annotation))
-    (setq remember-handler-functions '(org-remember-handler))
-    (add-hook 'remember-mode-hook 'org-remember-apply-template)
-    (define-key global-map "\C-cr" 'org-remember)
-    (setq org-remember-templates
-          ;; With one item emacs do not prompt choose template.
-          '((?t "* TODO %?" "~/.gtd/todo.org")
-            ;; (?j "* %^{topic}\n  %T\n" "~/.gtd/journal.org")
-            ))
-    (setq org-remember-store-without-prompt t)
-    ))
 
 ;;; ----------------------------------------------------------------
 (message "org-mode, GTD, PIM, organize, todo")
 
 (when (>= emacs-major-version 22)
-  (require 'org)
-  )
+  (require 'org))
 
 ;; XXX org-todo-keywords '((sequence "TODO" "START" "|" "DONE")) for org-version 4.67c
 ;; XXX (setq org-todo-keywords '("TODO" "START" "DONE")) for org-version 6.05b
@@ -902,6 +887,22 @@
             org-tags-column 64
             )
       (define-key global-map "\C-ca" 'org-agenda)
+
+      (when
+          (or (featurep 'remember) (fboundp 'remember))
+        (progn
+          (setq remember-annotation-functions '(org-remember-annotation))
+          (setq remember-handler-functions '(org-remember-handler))
+          (add-hook 'remember-mode-hook 'org-remember-apply-template)
+          (define-key global-map "\C-cr" 'org-remember)
+          (setq org-remember-templates
+                ;; With one item emacs do not prompt choose template.
+                '((?t "* TODO %?" "~/.gtd/todo.org")
+                  ;; (?j "* %^{topic}\n  %T\n" "~/.gtd/journal.org")
+                  ))
+          (setq org-remember-store-without-prompt t)
+          ))
+
       (setq org-agenda-files '("~/.gtd/todo.org"))
       ;; (setq org-todo-keyword-faces
       ;;       '(("TODO" . (:foreground "red" :weight bold))