diff --git a/pinerc b/pinerc
index 6fa552c..5a01b75 100755
--- a/pinerc
+++ b/pinerc
@@ -13,10 +13,10 @@
 # Lines beginning with "#" are comments, and ignored by Alpine.
 
 # Over-rides your full name from Unix password file. Required for PC-Alpine.
-personal-name=
+personal-name=Tom Willemsen
 
 # Sets domain part of From: and local addresses in outgoing mail.
-user-domain=ryuslash@gmail.com
+user-domain=gmail.com
 
 # List of SMTP servers for sending mail. If blank: Unix Alpine uses sendmail.
 smtp-server=smtp.gmail.com:587/tls/user=ryuslash@gmail.com
@@ -26,8 +26,7 @@ nntp-server=news.eternal-september.org/user=slash
 
 # Path of (local or remote) INBOX, e.g. ={mail.somewhere.edu}inbox
 # Normal Unix default is the local INBOX (usually /usr/spool/mail/$USER).
-inbox-path=
-#{pop.gmail.com/pop/ssl/user=ryuslash@gmail.com}INBOX
+inbox-path=~/.mail/Inbox
 
 # List of folder pairs; the first indicates a folder to archive, and the
 # second indicates the folder read messages in the first should
@@ -41,17 +40,17 @@ pruned-folders=
 # Over-rides default path for sent-mail folder, e.g. =old-mail (using first
 # folder collection dir) or ={host2}sent-mail or ="" (to suppress saving).
 # Default: sent-mail (Unix) or SENTMAIL.MTX (PC) in default folder collection.
-default-fcc=
+default-fcc=~/.mail/Sent
 
 # Over-rides default path for saved-msg folder, e.g. =saved-messages (using 1st
 # folder collection dir) or ={host2}saved-mail or ="" (to suppress saving).
 # Default: saved-messages (Unix) or SAVEMAIL.MTX (PC) in default collection.
-default-saved-msg-folder=
+default-saved-msg-folder=~/.mail/Saved
 
 # Over-rides default path for postponed messages folder, e.g. =pm (which uses
 # first folder collection dir) or ={host4}pm (using home dir on host4).
 # Default: postponed-msgs (Unix) or POSTPOND.MTX (PC) in default fldr coltn.
-postponed-folder=
+postponed-folder=~/.mail/Draft
 
 # If set, specifies where already-read messages will be moved upon quitting.
 read-message-folder=
@@ -76,7 +75,9 @@ feature-list=include-text-in-reply,
 	combined-folder-display,
 	single-column-folder-list,
 	selectable-item-nobold,
-	enable-mail-check-cue
+	enable-mail-check-cue,
+	disable-sender,
+	use-sender-not-x-sender
 
 # Alpine executes these keys upon startup (e.g. to view msg 13: i,j,1,3,CR,v)
 initial-keystroke-list=
@@ -85,7 +86,7 @@ initial-keystroke-list=
 default-composer-hdrs=
 
 # Add these customized headers (and possible default values) when composing
-customized-hdrs=From: "Tom Willemsen" <ryuslash@gmail.com>
+customized-hdrs=
 
 # When viewing messages, include this list of headers
 viewer-hdrs=
@@ -160,10 +161,10 @@ threading-expanded-character=
 threading-lastreply-character=
 
 # Allows a user to specify the threading style of specific folders
-threading-display-style-rule=
+threading-display-style-rule=struct
 
 # Allows a user to specify the threading index style of specific folders
-threading-index-style-rule=
+threading-index-style-rule=col1
 
 # Allows a user to set rules when composing messages.
 compose-rules=
@@ -540,7 +541,7 @@ personal-print-command=
 personal-print-category=
 
 # Patterns and their actions are stored here.
-patterns-roles=LIT:pattern="/NICK=Work Role/COMM=The role to use when communicating with work-related people\\n/TO=@iactor.nl/FROM=tom@iactor.nl/FLDTYPE=EMAIL" action="/ROLE=1/FROM=Tom Willemsen <tom@iactor.nl>/RTYPE=YES/FTYPE=YES/CTYPE=YES"
+patterns-roles=LIT:pattern="/NICK=Work Role/COMM=The role to use when communicating with work-related people\\n/PARTIC=iactor.nl,seiko/FLDTYPE=EMAIL" action="/ROLE=1/FROM='Tom Willemsen' <tom@iactor.nl>/SMTP=mail.iactor.nl:2525\/user=tom@iactor.nl/RTYPE=YES/FTYPE=YES/CTYPE=YES"
 
 # Patterns and their actions are stored here.
 patterns-filters2=