--- a/.emacs-my	Thu Mar 03 12:04:46 2011 +0200
+++ b/.emacs-my	Thu Mar 03 14:36:40 2011 +0200
@@ -875,7 +875,7 @@
       (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
       (setq
        org-directory "~/.gtd"
-       org-default-notes-file "~/.gtd/notes"
+       org-default-notes-file nil
        org-agenda-ndays 31
        org-deadline-warning-days 7
        org-agenda-show-all-dates t
@@ -887,6 +887,9 @@
        org-hide-leading-stars t
        org-tags-column 64
        )
+      (setq my-org-agenda-todo-file "~/.gtd/todo.org")
+      (setq my-org-agenda-note-file "~/.gtd/note.org")
+      (setq org-agenda-files `(,my-org-agenda-todo-file ,my-org-agenda-note-file))
       (define-key global-map "\C-ca" 'org-agenda)
 
       (when
@@ -898,13 +901,14 @@
           (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")
+                `(
+                  ("todo" ?t "* TODO %?" ,my-org-agenda-todo-file)
+                  ("note" ?n "* %^{Title}\n  %?\n  %a" ,my-org-agenda-note-file)
                   ))
           (setq org-remember-store-without-prompt t)
+          (org-remember-insinuate)
           ))
 
-      (setq org-agenda-files '("~/.gtd/todo.org"))
       ;; (setq org-todo-keyword-faces
       ;;       '(("TODO" . (:foreground "red" :weight bold))
       ;;         ("WAIT" . (:foreground "orange" :weight bold))