diff --git a/config/email.org b/config/email.org
index d46f3d9..812c41d 100644
--- a/config/email.org
+++ b/config/email.org
@@ -294,12 +294,21 @@
 
 ** iCalendar integration
 #+begin_src emacs-lisp
-  (with-eval-after-load 'mu4e
-    (require 'mu4e-icalendar)
+  (use-package gnus-icalendar
+    :custom
+    (gnus-icalendar-org-capture-file (expand-file-name ".diary/email.org.gpg" gnus-home-directory))
+    (gnus-icalendar-org-capture-headline '("Inbox"))
+    :config (gnus-icalendar-org-setup))
+
+  (use-package mu4e-icalendar
+    :after mu4e
+    :custom
+    (mu4e-icalendar-trash-after-reply nil)
+    :config
     (mu4e-icalendar-setup)
-    (setq mu4e-icalendar-trash-after-reply nil)
     (require 'gnus-icalendar)
-    (setq gnus-icalendar-org-capture-file (expand-file-name ".diary/email.org.gpg" gnus-home-directory))
-    (setq gnus-icalendar-org-capture-headline '("Inbox"))
     (gnus-icalendar-org-setup))
+
+  (with-eval-after-load 'mu4e
+    (require 'mu4e-icalendar))
 #+end_src
diff --git a/config/org-mode.org b/config/org-mode.org
index e165c4b..c1552bf 100644
--- a/config/org-mode.org
+++ b/config/org-mode.org
@@ -134,9 +134,9 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+end_src
 * org-agenda
 #+begin_src emacs-lisp :results output silent
-  (setq org-agenda-span 'day
+  (setq org-agenda-span 'week
         org-agenda-start-on-weekday 1
-        org-agenda-sticky nil
+        org-agenda-sticky t
         org-agenda-window-setup 'current-window
         org-agenda-tags-column 0
         org-agenda-diary-file 'diary-file
@@ -147,24 +147,14 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-agenda-prefix-format '((agenda . " %-12:c%?-12t% s")
                                    (todo . " %-12:c")
                                    (tags . " %-12:c")
-                                   (search . " %-12:c"))
-        org-agenda-files (list
-                          (expand-file-name org-directory)
-                          (expand-file-name "journal" org-directory)
-                          (expand-file-name "projects" org-directory)))
-#+end_src
+                                   (search . " %-12:c")))
 
-** Mobile agenda integration
-Better syncing to mobile, for use with [[https://github.com/orgzly-revived/orgzly-android-revived][Orgzly]].
-#+begin_src emacs-lisp
-  (with-eval-after-load 'org
-    (setq org-mobile-directory "~/.orgmobile/"
-          org-mobile-capture-file "inbox.org"
-          org-mobile-agendas nil
-          org-mobile-files (list (expand-file-name "diary.org" org-directory))
-          org-mobile-inbox-for-pull (expand-file-name "inbox.org" org-directory)
-          org-mobile-force-id-on-agenda-items nil)
-    (add-hook 'org-capture-finalize-hook #'org-mobile-push))
+  (require 'gnus-icalendar)
+  (setopt org-agenda-files (list
+                            gnus-icalendar-org-capture-file
+                            (expand-file-name org-directory)
+                            (expand-file-name "journal" org-directory)
+                            (expand-file-name "projects" org-directory)))
 #+end_src
 * org-journal
 #+begin_src emacs-lisp :results output silent