--- a/.emacs-my	Tue Feb 04 21:52:43 2014 +0200
+++ b/.emacs-my	Sun Mar 02 22:44:07 2014 +0200
@@ -1334,12 +1334,6 @@
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "remember-mode")
-
-(when (>= emacs-major-version 23)
-  (require 'remember))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "org-mode, GTD, PIM, organize, todo")
 
 (when (>= emacs-major-version 22)
@@ -1351,7 +1345,6 @@
   (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
   (setq org-directory "~/devel/my-devel/gtd")
   (setq
-   org-default-notes-file nil
    org-agenda-ndays 31
    org-deadline-warning-days 7
    org-agenda-show-all-dates t
@@ -1391,7 +1384,15 @@
   ;; `org-tag-alist' instead until bug fixed.
   (setq org-tag-persistent-alist nil)
 
-  (when (or (featurep 'remember) (fboundp 'remember))
+  (cond
+   ((featurep 'org-capture)
+    (setq org-default-notes-file my-org-agenda-todo-file)
+    (setq org-capture-templates
+          '(("t" "Todo" entry (file my-org-agenda-todo-file) "* TODO %?\n  SCHEDULED: %T")))
+    (define-key global-map "\C-vr"
+      (lambda () (interactive) (org-capture nil "t")))
+    )
+   ((or (featurep 'remember) (fboundp 'remember))
     (setq remember-annotation-functions '(org-remember-annotation))
     (setq remember-handler-functions '(org-remember-handler))
     (add-hook 'remember-mode-hook 'org-remember-apply-template)
@@ -1404,7 +1405,7 @@
             ))
     (setq org-remember-store-without-prompt t)
     (org-remember-insinuate)
-    )
+    ))
 
   ;; (setq org-todo-keyword-faces
   ;;       '(("TODO" . (:foreground "red" :weight bold))