diff --git a/emacs/.emacs.d/config/init-email.el b/emacs/.emacs.d/config/init-email.el
index e7a9315..42d28b1 100644
--- a/emacs/.emacs.d/config/init-email.el
+++ b/emacs/.emacs.d/config/init-email.el
@@ -67,7 +67,22 @@
                (mu4e-refile-folder . "/jeremy-dormitzer-gmail-com/Archive")
                (mu4e-trash-folder . "/jeremy-dormitzer-gmail-com/Trash")
                (message-sendmail-extra-arguments
-                . ("-a" "jeremy-dormitzer-gmail-com"))))))
+                . ("-a" "jeremy-dormitzer-gmail-com"))))
+     ,(make-mu4e-context
+       :name "Spotify Gmail"
+       :match-func (lambda (msg)
+                     (when msg
+                       (string-match-p
+                        "jdormitzer-spotify-com"
+                        (mu4e-message-field msg :path))))
+       :vars '((user-mail-address . "jdormitzer@spotify.com")
+               (mu4e-compose-signature . nil)
+               (mu4e-sent-folder . "/jdormitzer-spotify-com/Sent")
+               (mu4e-drafts-folder . "/jdormitzer-spotify-com/Drafts")
+               (mu4e-refile-folder . "/jdormitzer-spotify-com/Archive")
+               (mu4e-trash-folder . "/jdormitzer-spotify-com/Trash")
+               (message-sendmail-extra-arguments
+                . ("-a" "jdormitzer-spotify-com"))))))
   ;; Custom mark function to mark messages matching the current message
   (defun mu4e-mark-matching-pred (msg from)
     (mu4e-message-contact-field-matches msg :from from))
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 05de681..ae70103 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -51,4 +51,55 @@ Channel jeremy-dormitzer-gmail-com-inbox
 Channel jeremy-dormitzer-gmail-com-all
 Channel jeremy-dormitzer-gmail-com-drafts
 Channel jeremy-dormitzer-gmail-com-sent
-Channel jeremy-dormitzer-gmail-com-archive
\ No newline at end of file
+Channel jeremy-dormitzer-gmail-com-archive
+
+IMAPAccount jdormitzer-spotify-com
+Host imap.gmail.com
+User jdormitzer@spotify.com
+PassCmd "pass show spotify-google-app-password | head -n 1"
+SSLType IMAPS
+CertificateFile ~/cert.pem
+AuthMechs LOGIN
+PipelineDepth 50
+
+IMAPStore jdormitzer-spotify-com-remote
+Account jdormitzer-spotify-com
+MaxSize 25M
+
+MaildirStore jdormitzer-spotify-com-local
+Path ~/.mail/jdormitzer-spotify-com/
+Inbox ~/.mail/jdormitzer-spotify-com/Inbox
+SubFolders Verbatim
+
+Channel jdormitzer-spotify-com-inbox
+Master :jdormitzer-spotify-com-remote:INBOX
+Slave :jdormitzer-spotify-com-local:Inbox
+
+Channel jdormitzer-spotify-com-all
+Master :jdormitzer-spotify-com-remote:
+Slave :jdormitzer-spotify-com-local:
+Patterns * ![Gmail]* !"[Google Mail]*" !INBOX !Inbox !Archive !Trash !Sent !Drafts
+
+Channel jdormitzer-spotify-com-trash
+Master :jdormitzer-spotify-com-remote:"[Gmail]/Trash"
+Slave :jdormitzer-spotify-com-local:"Trash"
+
+Channel jdormitzer-spotify-com-sent
+Master :jdormitzer-spotify-com-remote:"[Gmail]/Sent Mail"
+Slave :jdormitzer-spotify-com-local:"Sent"
+
+Channel jdormitzer-spotify-com-drafts
+Master :jdormitzer-spotify-com-remote:"[Gmail]/Drafts"
+Slave :jdormitzer-spotify-com-local:"Drafts"
+
+Channel jdormitzer-spotify-com-archive
+Master :jdormitzer-spotify-com-remote:"[Gmail]/All Mail"
+Slave :jdormitzer-spotify-com-local:"Archive"
+
+Group jdormitzer-spotify-com
+Channel jdormitzer-spotify-com-trash
+Channel jdormitzer-spotify-com-inbox
+Channel jdormitzer-spotify-com-all
+Channel jdormitzer-spotify-com-drafts
+Channel jdormitzer-spotify-com-sent
+Channel jdormitzer-spotify-com-archive
\ No newline at end of file
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 3723f75..92623e3 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -11,9 +11,9 @@ from jeremy.dormitzer@gmail.com
 user jeremy.dormitzer@gmail.com
 passwordeval pass show imap.gmail.com | head -n 1
 
-account jeremydormitzer-lola-com
-from jeremydormitzer@lola.com
-user jeremydormitzer@lola.com
-passwordeval pass show jeremydormitzer@lola.com-app-password | head -n 1
+account jdormitzer-spotify-com
+from jdormitzer@spotify.com
+user jdormitzer@spotify.com
+passwordeval pass show spotify-google-app-password | head -n 1
 
 account default : jeremy-dormitzer-gmail-com
\ No newline at end of file