diff --git a/home/dot-mbsyncrc b/home/dot-mbsyncrc
old mode 100644
new mode 100755
index 7f85527..6712d74
--- a/home/dot-mbsyncrc
+++ b/home/dot-mbsyncrc
@@ -9,120 +9,19 @@ Create Both
 # !!!! Note that empty lines delimit sections !!!!
 
 MaildirStore local
-Path ~/Mail/
+Path ~/mail/mbsync
 Trash Trash
 
+IMAPStore gmx
+Host imap.gmx.net
+User jonashahn1@gmx.net
+PassCmd "pass gmximap"
 
-IMAPStore work
-Host work.host.com
-User tehuser
-Pass xxxxxxxx
-# Fetch password from gnome-keyring:
-#PassCmd "gnome-keyring-query get mail_pw"
-# Fetch password from .netrc:
-#PassCmd "sed -n -e 's,^machine work\\.host\\.com login tehuser password \\(.*\\),\\1,p' < $HOME/.netrc"
-# Fetch password from a gpg-encrypted file:
-#PassCmd "gpg --quiet --for-your-eyes-only --decrypt $HOME/imappassword.gpg"
-# Fetch password from pwmd (http://pwmd.sourceforge.net/):
-#PassCmd "echo -ne 'GET myIsp\\tpassword' | pwmc datafile"
-
-Channel work
-Far :work:
-Near :local:work
-Expunge Near
-Sync PullNew Push
-
-
-IMAPStore personal
-Host host.play.com
-Port 6789
-TLSType None
-
-Channel personal
-Far :personal:
-Near :local:personal
-Expunge Both
+Channel gmx
+Far :gmx:
+Near :local:gmx
 MaxMessages 150
 MaxSize 200k
 
-IMAPStore remote
-Tunnel "ssh -q host.remote.com /usr/sbin/imapd"
-
-Channel remote
-Far :remote:
-Near :local:remote
-
-
 Group boxes
-Channels work personal remote
-
-
-# Due to the divergent Path suffixes, it's possible to have
-# multiple Stores homed in the same directory.
-# You could even put them all directly into $HOME.
-
-MaildirStore local-personal
-Path ~/Mail/personal-
-Inbox ~/Mail/personal-INBOX
-
-MaildirStore local-work
-Path ~/Mail/work-
-# Just because.
-Inbox ~/Mail/w0rk_InBoX
-
-Channel personal-joined
-Far :personal:
-Near :local-personal:
-Patterns *
-
-Channel work-joined
-Far :work:
-Near :local-work:
-Patterns *
-
-Group joined personal-joined work-joined
-
-
-IMAPStore st1
-Host st1.domain.com
-AuthMech CRAM-MD5
-# Omit if you want to use the system certificate store.
-CertificateFile ~/.st1-certificate.crt
-
-IMAPStore st2
-Host imap.another-domain.com
-Path non-standard/
-TLSVersions -1.2
-
-Channel rst
-Far :st1:somebox
-Near :st2:
-
-
-IMAPAccount server
-Host imaps:foo.bar.com
-# Omit if you want to use the system certificate store.
-CertificateFile ~/.server-certificate.crt
-
-IMAPStore server
-Account server
-MapInbox inbox
-Trash ~/trash
-TrashRemoteNew yes
-
-MaildirStore mirror
-Path ~/Maildir/
-SubFolders Verbatim
-
-Channel o2o
-Far :server:
-Near :mirror:
-Patterns %
-
-Group partial o2o:inbox,sent-mail,foobar
-
-# INBOX => server, INBOX.foo => server.foo, etc.
-Channel inbox
-Far :server:INBOX
-Near :mirror:server
-Patterns *
+Channels gmx
diff --git a/home/dot-offlineimap.py b/home/dot-offlineimap.py
new file mode 100644
index 0000000..2850a6d
--- /dev/null
+++ b/home/dot-offlineimap.py
@@ -0,0 +1,5 @@
+#! /usr/bin/env python
+from subprocess import check_output
+
+def get_pass(account):
+    return check_output("pass " + account, shell=True).splitlines()[0]
diff --git a/home/dot-offlineimaprc b/home/dot-offlineimaprc
index 9e63e89..ebe4b44 100644
--- a/home/dot-offlineimaprc
+++ b/home/dot-offlineimaprc
@@ -1,20 +1,33 @@
 [general]
-accounts = Test
+accounts = Uni Gmx
 
-[Account Test]
+[Account Uni]
 localrepository = Local
 remoterepository = Remote
 
-[Repository Local]
+[Repository LocalUni]
 type = Maildir
 localfolders = ~/mail/offline/
 
-[Repository Remote]
+[Repository RemoteUni]
 sslcacertfile = /etc/ssl/certs/ca-certificates.crt
 type = IMAP
 remoteuser = ug-student\j.hahn02
 remotehost = email.gwdg.de
 
+[Account Gmx]
+localrepository = Local
+remoterepository = Remote
+
+[Repository LocalGmx]
+type = Maildir
+localfolders = ~/mail/offline/
+
+[Repository RemoteGmx]
+type = IMAP
+remoteuser = jonashahn1@gmx.net
+remotehost = imap.gmx.net
+
 [mbnames]
 enabled = yes
 filename = ~/.mutt-mailboxes