diff --git a/goimapnotify/.config/goimapnotify/disroot.conf b/goimapnotify/.config/goimapnotify/disroot.conf
new file mode 100644
index 0000000..aad9f96
--- /dev/null
+++ b/goimapnotify/.config/goimapnotify/disroot.conf
@@ -0,0 +1,15 @@
+{
+  "host": "disroot.org",
+  "port": 993,
+  "tls": true,
+  "tlsOptions": {
+    "rejectUnauthorized": true
+  },
+  "username": "akasroua@disroot.org",
+  "passwordCmd": "pass web/disroot.org",
+  "onNewMail": "mbsync disroot",
+  "onNewMailPost": "notmuch new",
+  "boxes": [
+    "INBOX"
+  ]
+}
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index eef8e7e..d1e0d42 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -115,3 +115,65 @@ Channel ugent-sent
 Channel ugent-trash
 Channel ugent-archive
 Channel ugent-junk
+
+IMAPAccount disroot
+Host disroot.org
+User akasroua@disroot.org
+AuthMechs LOGIN
+PassCmd "pass web/disroot.org"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore disroot-remote
+Account disroot
+
+MaildirStore disroot-local
+Subfolders Verbatim
+# The trailing "/" is important
+Path ~/.mail/disroot/
+Inbox ~/.mail/disroot/inbox/
+
+Channel sync-disroot-default
+Far :disroot-remote:
+Near :disroot-local:
+Create Both
+Expunge Both
+SyncState *
+
+
+Channel sync-disroot-sent
+Far :disroot-remote:"Sent"
+Near :disroot-local:sent
+Create Both
+Expunge Both
+SyncState *
+
+
+Channel sync-disroot-trash
+Far :disroot-remote:"Trash"
+Near :disroot-local:trash
+Create Both
+Expunge Both
+SyncState *
+
+
+Channel sync-disroot-junk
+Far :disroot-remote:"Junk"
+Near :disroot-local:junk
+Create Both
+Expunge Both
+SyncState *
+
+Channel sync-disroot-bookings
+Far :disroot-remote:"Bookings"
+Near :disroot-local:bookings
+Create Both
+Expunge Both
+SyncState *
+
+Group disroot
+Channel sync-disroot-default
+Channel sync-disroot-sent
+Channel sync-disroot-trash
+Channel sync-disroot-junk
+Channel sync-disroot-bookings
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index c2ce5b6..2cdee33 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -20,3 +20,10 @@ port 587
 from amin.kasrouaouam@ugent.be
 user amin.kasrouaouam@ugent.be
 passwordeval "/home/coolneng/.local/share/scripts/mutt_oauth2.py /home/coolneng/.cache/tokenfile"
+
+account disroot
+host disroot.org
+port 587
+from akasroua@disroot.org
+user akasroua@disroot.org
+passwordeval "pass web/disroot.org"
diff --git a/neomutt/.config/neomutt/accounts/disroot.muttrc b/neomutt/.config/neomutt/accounts/disroot.muttrc
new file mode 100644
index 0000000..fa487d7
--- /dev/null
+++ b/neomutt/.config/neomutt/accounts/disroot.muttrc
@@ -0,0 +1,24 @@
+# vim: filetype=neomuttrc
+# muttrc file for account disroot
+set realname = "Amin Kasrou Aouam"
+set from = "akasroua@disroot.org"
+set sendmail = "~/.config/neomutt/etc/sendmail disroot"
+set folder = "~/.mail/disroot"
+
+set mbox_type = Maildir
+set ssl_starttls = yes
+set ssl_force_tls = yes
+
+bind index,pager gg noop
+bind index,pager g noop
+bind index gg first-entry
+unmailboxes *
+mailboxes =junk =inbox =trash =sent =bookings
+macro index,pager gi "<change-folder>=inbox<enter>" "Go to inbox."
+macro index,pager gs "<change-folder>=sent<enter>" "Go to sent."
+macro index,pager gt "<change-folder>=trash<enter>" "Go to trash."
+macro index,pager gj "<change-folder>=junk<enter>" "Go to spam."
+macro index,pager gb "<change-folder>=bookings<enter>" "Go to bookings."
+set spoolfile = "+inbox"
+set postponed = ""
+set trash = "+trash"
diff --git a/neomutt/.config/neomutt/personal.muttrc b/neomutt/.config/neomutt/personal.muttrc
index 3ef74b8..e18c0f7 100644
--- a/neomutt/.config/neomutt/personal.muttrc
+++ b/neomutt/.config/neomutt/personal.muttrc
@@ -1,3 +1,5 @@
+macro index,pager i3 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/disroot.muttrc<enter><change-folder>!<enter>'
+source /home/coolneng/.config/neomutt/accounts/disroot.muttrc
 macro index,pager i2 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/gmail.muttrc<enter><change-folder>!<enter>'
 source /home/coolneng/.config/neomutt/accounts/gmail.muttrc
 macro index,pager i1 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/ugent.muttrc<enter><change-folder>!<enter>'