From 9a302967fa79c627aba34268d7c2d38aa702abd8 Mon Sep 17 00:00:00 2001
From: Vasil Zlatanov <vasil.zlatanov@gmail.com>
Date: Tue, 2 Sep 2014 21:24:38 +0200
Subject: back to gmail after bitmessage fail

---
 msmtprc       |  4 ++--
 muttrc        | 38 ++++++++++++++++++++------------------
 offlineimaprc |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/msmtprc b/msmtprc
index 180af12..74aa1fa 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,4 +1,4 @@
-account default 
+account bitmessage 
 host mail.bitmessage.ch
 port 465
 protocol smtp
@@ -9,7 +9,7 @@ tls on
 tls_starttls off
 tls_nocertcheck
 
-account gmail 
+account default 
 host smtp.gmail.com
 port 587
 protocol smtp
diff --git a/muttrc b/muttrc
index 0ff9c1a..1ebb758 100644
--- a/muttrc
+++ b/muttrc
@@ -15,33 +15,33 @@ set mbox_type   = Maildir
 set sendmail    = /usr/bin/msmtp
 
 set folder      = ~/.mail/
-set spoolfile   = "+Swiss/INBOX"
-#set mbox        = "+Swiss/archive"
-set postponed   = "+Swiss/INBOX.Drafts"
-set record      = "+Swiss/INBOX.Sent"
-set copy=yes
+set spoolfile   = "+Gmail/INBOX"
+set mbox        = "+Gmail/archive"
+set postponed   = "+Gmail/drafts"
+unset record
 
 mailboxes +INBOX
 
 macro index D \
-    "<save-message>+Swiss/INBOX.Trash<enter>" \
+    "<save-message>+Gmail/trash<enter>" \
     "move message to the trash"
 
-#macro index S \
-#    "<save-message>+Swiss/INBOX.Spam<enter>" \
-#    "mark message as spam"
+macro index S \
+    "<save-message>+Gmail/spam<enter>" \
+    "mark message as spam"
 
 
 # Gmail conf
-set from = "vasco@bitmessage.ch"
+set from = "vasil.zlatanov@gmail.com"
 set realname = "Vasil Zlatanov"
 
 # Change the following line to a different editor you prefer.
 set editor = "vim"
 
 # Basic config, you can leave this as is
-set mail_check = 15
-set timeout = 1
+#set hostname = gmail.com
+set mail_check = 5
+set timeout = 15
 unset imap_passive
 set header_cache=~/.muttlocal/cache/headers
 set message_cachedir=~/.muttlocal/cache/bodies
@@ -59,10 +59,13 @@ alternative_order text/plain text/html *
 auto_view text/html
 
 # Gmail-style keyboard shortcuts
-macro index,pager gi "<change-folder>=Swiss/INBOX<enter>" "Go to inbox"
-macro index,pager gs "<change-folder>=Swiss/INBOX.Sent<tab><enter>" "Go to sent mail"
-macro index,pager gt "<change-folder>=Swiss/INBOX.Trash<enter>" "Go to trash"
-macro index,pager gd "<change-folder>=Swiss/INBOX.Drafts<enter>" "Go to drafts"
+macro index,pager gi "<change-folder>=Gmail/INBOX<enter>" "Go to inbox"
+macro index,pager ga "<change-folder>=Gmail/archive<tab><enter>" "Go to all mail"
+macro index,pager gs "<change-folder>=Gmail/sent<tab><enter>" "Go to sent mail"
+macro index,pager gr "<change-folder>=Gmail/flagged<enter>" "Go to starred messages"
+macro index,pager gj "<change-folder>=Gmail/spam<enter>" "Go to spam"
+macro index,pager gt "<change-folder>=Gmail/trash<enter>" "Go to trash"
+macro index,pager gd "<change-folder>=Gmail/drafts<enter>" "Go to drafts"
 
 # Other config
 set delete 
@@ -78,7 +81,6 @@ bind index,pager "N" search-next
 bind browser d half-down
 bind index d half-down
 bind pager d half-down
-bind index D delete-message
 
 bind browser u half-up
 bind index u half-up
@@ -91,7 +93,7 @@ bind pager G        bottom
 bind index R        group-reply
 
 # Write in Aliases when opening email
-set display_filter="$HOME/.mutt/alias.sh"
+set display_filter='$HOME/.mutt/alias.sh'
 
 # Mutt LED notification 
 set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|"
diff --git a/offlineimaprc b/offlineimaprc
index 8dc0428..ba7ee45 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 ui = ttyui
-accounts = BitMessage
+accounts = Gmail
 # This will suppress anything but errors
 ui = quiet
 
-- 
cgit v1.2.3-54-g00ecf