diff --git a/global.org b/global.org
index e569601..480f99d 100644
--- a/global.org
+++ b/global.org
@@ -1124,7 +1124,7 @@
                                                      "Professor · U Toronto\n"))))
 
               ,(make-mu4e-context
-                :name "CMP Editor"
+                :name (propertize "CMP Editor" 'face 'org-level-1)
                 :enter-func
                 (lambda () (mu4e-message "Switch to the CMP Editor context"))
                 :leave-func
@@ -1145,6 +1145,53 @@
                          ( mu4e-compose-signature . (concat
                                                      "Jacopo De Simoi (he · him)\n"
                                                      "Associate Editor for CMP\n"
+                                                     "Professor · U Toronto\n"))))
+
+              ,(make-mu4e-context
+                :name "JMD Editor"
+                :enter-func
+                (lambda () (mu4e-message "Switch to the JMD Editor context"))
+                :leave-func
+                (lambda () (mu4e-message "Leave the JMD Editor context"))
+                ;; we match based on the maildir of the message
+                :match-func (lambda (msg)
+                              (when msg
+                                (string-match-p "^/math/editorial.JMD" (mu4e-message-field
+                                                                        msg :maildir))))
+                :vars '( ( user-mail-address      . "jacopods@math.utoronto.ca" )
+                         ( user-full-name	      . "Jacopo De Simoi" )
+                         ( mu4e-sent-folder       . "/math/Sent")
+                         ( mu4e-drafts-folder     . "/math/Drafts")
+                         ( mu4e-trash-folder      . "/math/Trash")
+                         ( mu4e-refile-folder     . "/math/editorial.JMD.Archive")
+                         ( smtpmail-stream-type   . starttls )
+                         ( smtpmail-smtp-service  . 587 )
+                         ( mu4e-compose-signature . (concat
+                                                     "Jacopo De Simoi (he · him)\n"
+                                                     "Editor for JMD\n"
+                                                     "Professor · U Toronto\n"))))
+              ,(make-mu4e-context
+                :name "AMQ Editor"
+                :enter-func
+                (lambda () (mu4e-message "Switch to the AMQ Editor context"))
+                :leave-func
+                (lambda () (mu4e-message "Leave the AMQ Editor context"))
+                ;; we match based on the maildir of the message
+                :match-func (lambda (msg)
+                              (when msg
+                                (string-match-p "^/math/editorial.AMQ" (mu4e-message-field
+                                                                        msg :maildir))))
+                :vars '( ( user-mail-address      . "jacopods@math.utoronto.ca" )
+                         ( user-full-name	      . "Jacopo De Simoi" )
+                         ( mu4e-sent-folder       . "/math/Sent")
+                         ( mu4e-drafts-folder     . "/math/Drafts")
+                         ( mu4e-trash-folder      . "/math/Trash")
+                         ( mu4e-refile-folder     . "/math/editorial.AMQ.Archive")
+                         ( smtpmail-stream-type   . starttls )
+                         ( smtpmail-smtp-service  . 587 )
+                         ( mu4e-compose-signature . (concat
+                                                     "Jacopo De Simoi (he · him)\n"
+                                                     "Editor for AMQ\n"
                                                      "Professor · U Toronto\n"))))))
 
      ;; set `mu4e-context-policy` and `mu4e-compose-policy` to tweak when mu4e should