--- /dev/null
+# general settings
+alternates -group me samir.benmendil@gmail.com ram-z@hotmail.com @rmz.io
+alternates -group me -group chakra ram-z@chakra chakra@rmz.io
+alternates -group me -group unimaas s.benmendil@student.maastrichtuniversity.nl
+alternates -group me -group cadscan sb@cad-scan.co.uk
+
+set mail_check = 0
+set envelope_from
+set forward_format = "Fwd: %s"
+set forward_quote = yes
+
+set edit_headers = yes # more power
+set askcc = yes # ask until I have goobook completion in vim
+set editor = vim # d'uh
+set include = yes # don't ask, just do
+set delete = yes # don't ask, just do
+set date_format = "!%b %d, %Y at %-H:%M" # use 24-hour clock
+
+# send clacks
+my_hdr X-Clacks-Overhead: GNU Terry Pratchett
+my_hdr Bcc: sent@rmz.io
+
+# goobook
+set query_command = "goobook query '%s'"
+
+# sort/threading
+set sort = threads
+set sort_aux = last-date-received
+set sort_re = yes
+set duplicate_threads = yes
+set collapse_unread = no
+
+# lists
+subscribe -group chakra ^chakra-.*@googlegroups.com
+subscribe -group clementine clementine-player@googlegroups.com
+subscribe -group ros @lists.ros.org$
+subscribe -group sailfish @lists.sailfishos.org
+subscribe -group neovim ^neovim.*github.com
+subscribe -group mutt mutt-users@mutt.org
+subscribe -group qutebrowser ^qutebrowser.*
+subscribe -group lug @mailman.lug.org.uk
+
+# performance tuning
+set read_inc = 1000 # nb of messages read before printing status
+set write_inc = 1000 # nb of messages written before printing status
+set time_inc = 100 # time interval (ms) between status print
+
+# look and feel
+set pager_index_lines = 12
+set pager_context = 5
+set pager_stop = yes # don't jump to next message
+set resolve = yes # jump when flagging
+set menu_scroll = yes
+set wrap = 78
+set reflow_wrap = 78 # reflow received format=flowed msgs
+set text_flowed = yes # write f=f messages
+set smart_wrap = yes # wrap at word boundaries
+set tilde = yes # fills end of messages with tilde
+set markers = no
+set mark_old = no # leave messages as new if unread
+set status_on_top = yes # also help on bottom
+set wait_key = no # don't wait for enter key
+set index_format="[%Z] %{%e/%m} %15.15L %?M?+ ?%s"
+
+# header
+ignore *
+unignore from: to: cc: date: subject: x-clacks-overhead:
+unhdr_order *
+hdr_order from: to: cc: date: subject: x-clacks-overhead:
+
+# deal with crap
+set mailcap_path = ~/.mutt/mailcap
+auto_view text/html # view html automatically
+alternative_order text/plain text/enriched text/html # save html for last
+
+# IMAP: offlineimap
+set folder = "~/mail" # mail folder
+set spoolfile = "+office365/inbox" # set inbox
+unset record # do not move sent msgs to a folder, gmail does that
+unset move # do not move read msgs, gmail does that
+set postponed = "+office365/drafts" # drafts folder
+set header_cache = "~/.cache/mutt" # cache headers for speedss
+source ~/.mutt/mailboxes # source mailboxes generetated by offlineimap
+
+<<<<<<< Updated upstream
+# SMTP: msmtp
+set sendmail = /usr/bin/msmtp # use msmtp
+set send_charset="utf-8" # only utf8
+=======
+# IMAP: ultrahaptics
+# source "printf 'set my_uhpass=\"%s\"' $(pass ultrahaptics/office365/samir.benmendil@ultrahaptics.com) |"
+# set imap_user="samir.benmendil@ultrahaptics.com"
+# set imap_pass=$my_uhpass
+# set folder="imaps://outlook.office365.com:993"
+# set spoolfile = +INBOX
+# set header_cache=~/.cache/mutt
+# set message_cachedir=~/.cache/mutt
+# set ssl_use_sslv3=yes
+# set ssl_force_tls=yes
+# set ssl_starttls=yes
+
+# mailboxes
+
+# # IMAP: offlineimap
+# set folder = "~/mail" # mail folder
+# set spoolfile = "+gmail/inbox" # set inbox
+# unset record # do not move sent msgs to a folder, gmail does that
+# unset move # do not move read msgs, gmail does that
+# set postponed = "+gmail/drafts" # drafts folder
+# set header_cache = "~/.cache/mutt" # cache headers for speedss
+# source ~/.mutt/mailboxes # source mailboxes generetated by offlineimap
+
+# SMTP: msmtp (with queue)
+set sendmail = ~/.msmtp/msmtpq # use msmtp message queue
+set sendmail_wait = -1 # fork sendmail to the background
+set send_charset="us-ascii:utf-8" # only use ascii and utf8
+>>>>>>> Stashed changes
+
+# GnuPG
+set crypt_autosign = yes # autosign messages
+set crypt_replyencrypt = yes # encrypt replies to encrypted messages
+set crypt_replysign = yes # sign replies to signed messages
+set crypt_replysignencrypted = yes # you get the idea
+set crypt_verify_sig = yes # verify signatures
+set pgp_long_ids = yes # use 64 bit key IDs
+set pgp_mime_auto = no # don't fallback to inline mime
+set pgp_use_gpg_agent = yes # don't ask for passwords
+source /usr/share/doc/mutt/samples/gpg.rc
+
+source ~/.mutt/hooks
+source ~/.mutt/bindings
+source ~/.mutt/colors/badfox # color theme