6 files changed, 229 insertions, 26 deletions
diff --git a/.claws-mail/accountrc b/.claws-mail/accountrc
index 8ffc920..034f73b 100644
--- a/.claws-mail/accountrc
+++ b/.claws-mail/accountrc
@@ -107,3 +107,113 @@ draft_folder=
 set_trash_folder=0
 trash_folder=
 imap_use_trash=1
+
+[Account: 2]
+account_name=patrick.mcdermott@libiquity.com
+is_default=0
+name=Patrick McDermott
+address=patrick.mcdermott@libiquity.com
+organization=Libiquity LLC
+protocol=3
+receive_server=mail.libiquity.com
+smtp_server=mail.libiquity.com
+nntp_server=
+local_mbox=/var/mail
+use_mail_command=0
+mail_command=/usr/sbin/sendmail -t -i
+use_nntp_auth=0
+use_nntp_auth_onconnect=0
+user_id=patrick.mcdermott
+password=!
+use_apop_auth=0
+remove_mail=1
+message_leave_time=7
+message_leave_hour=0
+enable_size_limit=0
+size_limit=1024
+filter_on_receive=0
+filterhook_on_receive=1
+imap_auth_method=0
+receive_at_get_all=1
+max_news_articles=300
+inbox=#imap/pj@pehjota.net/INBOX
+local_inbox=#imap/pj@pehjota.net/INBOX
+imap_directory=
+imap_subsonly=0
+low_bandwidth=0
+generate_msgid=1
+generate_xmailer=1
+add_custom_header=0
+msgid_with_addr=0
+use_smtp_auth=0
+smtp_auth_method=0
+smtp_user_id=
+smtp_password=!
+pop_before_smtp=0
+pop_before_smtp_timeout=5
+signature_type=0
+signature_path=/home/pj/.signature
+auto_signature=1
+signature_separator=-- 
+set_autocc=0
+auto_cc=
+set_autobcc=0
+auto_bcc=
+set_autoreplyto=0
+auto_replyto=
+enable_default_dictionary=0
+default_dictionary=en
+enable_default_alt_dictionary=0
+default_alt_dictionary=en
+compose_with_format=0
+compose_subject_format=
+compose_body_format=
+reply_with_format=0
+reply_quotemark=
+reply_body_format=
+forward_with_format=0
+forward_quotemark=
+forward_body_format=
+default_privacy_system=
+default_encrypt=0
+default_encrypt_reply=1
+default_sign=0
+default_sign_reply=1
+save_clear_text=0
+encrypt_to_self=0
+privacy_prefs=
+ssl_pop=0
+ssl_imap=2
+ssl_nntp=0
+ssl_smtp=0
+ssl_certs_auto_accept=0
+use_nonblocking_ssl=1
+in_ssl_client_cert_file=
+in_ssl_client_cert_pass=!
+out_ssl_client_cert_file=
+out_ssl_client_cert_pass=!
+set_smtpport=0
+smtp_port=25
+set_popport=0
+pop_port=110
+set_imapport=0
+imap_port=143
+set_nntpport=0
+nntp_port=119
+set_domain=0
+domain=
+gnutls_set_priority=0
+gnutls_priority=
+set_tunnelcmd=0
+tunnelcmd=
+mark_crosspost_read=0
+crosspost_color=0
+set_sent_folder=0
+sent_folder=
+set_queue_folder=0
+queue_folder=
+set_draft_folder=0
+draft_folder=
+set_trash_folder=0
+trash_folder=
+imap_use_trash=1
diff --git a/.claws-mail/accountrc.bak b/.claws-mail/accountrc.bak
index 8ffc920..034f73b 100644
--- a/.claws-mail/accountrc.bak
+++ b/.claws-mail/accountrc.bak
@@ -107,3 +107,113 @@ draft_folder=
 set_trash_folder=0
 trash_folder=
 imap_use_trash=1
+
+[Account: 2]
+account_name=patrick.mcdermott@libiquity.com
+is_default=0
+name=Patrick McDermott
+address=patrick.mcdermott@libiquity.com
+organization=Libiquity LLC
+protocol=3
+receive_server=mail.libiquity.com
+smtp_server=mail.libiquity.com
+nntp_server=
+local_mbox=/var/mail
+use_mail_command=0
+mail_command=/usr/sbin/sendmail -t -i
+use_nntp_auth=0
+use_nntp_auth_onconnect=0
+user_id=patrick.mcdermott
+password=!
+use_apop_auth=0
+remove_mail=1
+message_leave_time=7
+message_leave_hour=0
+enable_size_limit=0
+size_limit=1024
+filter_on_receive=0
+filterhook_on_receive=1
+imap_auth_method=0
+receive_at_get_all=1
+max_news_articles=300
+inbox=#imap/pj@pehjota.net/INBOX
+local_inbox=#imap/pj@pehjota.net/INBOX
+imap_directory=
+imap_subsonly=0
+low_bandwidth=0
+generate_msgid=1
+generate_xmailer=1
+add_custom_header=0
+msgid_with_addr=0
+use_smtp_auth=0
+smtp_auth_method=0
+smtp_user_id=
+smtp_password=!
+pop_before_smtp=0
+pop_before_smtp_timeout=5
+signature_type=0
+signature_path=/home/pj/.signature
+auto_signature=1
+signature_separator=-- 
+set_autocc=0
+auto_cc=
+set_autobcc=0
+auto_bcc=
+set_autoreplyto=0
+auto_replyto=
+enable_default_dictionary=0
+default_dictionary=en
+enable_default_alt_dictionary=0
+default_alt_dictionary=en
+compose_with_format=0
+compose_subject_format=
+compose_body_format=
+reply_with_format=0
+reply_quotemark=
+reply_body_format=
+forward_with_format=0
+forward_quotemark=
+forward_body_format=
+default_privacy_system=
+default_encrypt=0
+default_encrypt_reply=1
+default_sign=0
+default_sign_reply=1
+save_clear_text=0
+encrypt_to_self=0
+privacy_prefs=
+ssl_pop=0
+ssl_imap=2
+ssl_nntp=0
+ssl_smtp=0
+ssl_certs_auto_accept=0
+use_nonblocking_ssl=1
+in_ssl_client_cert_file=
+in_ssl_client_cert_pass=!
+out_ssl_client_cert_file=
+out_ssl_client_cert_pass=!
+set_smtpport=0
+smtp_port=25
+set_popport=0
+pop_port=110
+set_imapport=0
+imap_port=143
+set_nntpport=0
+nntp_port=119
+set_domain=0
+domain=
+gnutls_set_priority=0
+gnutls_priority=
+set_tunnelcmd=0
+tunnelcmd=
+mark_crosspost_read=0
+crosspost_color=0
+set_sent_folder=0
+sent_folder=
+set_queue_folder=0
+queue_folder=
+set_draft_folder=0
+draft_folder=
+set_trash_folder=0
+trash_folder=
+imap_use_trash=1
diff --git a/.claws-mail/clawsrc b/.claws-mail/clawsrc
index eadad2e..18c88a4 100644
--- a/.claws-mail/clawsrc
+++ b/.claws-mail/clawsrc
@@ -195,7 +195,7 @@ mainwin_menubar=1
 mainwin_width=1280
 mainwin_height=749
 messagewin_width=600
-messagewin_height=540
+messagewin_height=745
 mimeview_tree_height=60
 sourcewin_width=600
 sourcewin_height=500
@@ -329,7 +329,7 @@ zero_replacement_char=0
 editaccountwin_width=700
 editaccountwin_height=550
 accountswin_width=500
-accountswin_height=-1
+accountswin_height=380
 logwin_width=520
 logwin_height=-1
 filtering_debugwin_width=600
diff --git a/.claws-mail/clawsrc.bak b/.claws-mail/clawsrc.bak
index 3c3ca51..1dc9212 100644
--- a/.claws-mail/clawsrc.bak
+++ b/.claws-mail/clawsrc.bak
@@ -18,7 +18,7 @@ save_message=1
 confirm_send_queued_messages=0
 send_dialog_mode=0
 sendwin_width=460
-sendwin_height=-1
+sendwin_height=250
 outgoing_charset=AUTO
 encoding_method=0
 outgoing_fallback_to_ascii=1
@@ -59,7 +59,7 @@ reedit_account_autoselect=1
 default_reply_list=1
 show_ruler=1
 reply_quote_mark=> 
-reply_quote_format=On %D{%Y-%m-%d} at %D{%H:%M}, %f wrote:\n\n%q\n%X
+reply_quote_format=On %D{%Y-%m-%d} at %D{%H:%M}, %N wrote:\n%q\n%X
 forward_quote_mark=> 
 forward_quote_format=\n\n-------- Forwarded Message --------\n\n?s{Subject: %s\n}?d{Date: %d\n}?f{From: %f\n}?t{To: %t\n}?c{Cc: %c\n}?n{Newsgroups: %n\n}\n\n%M
 quote_chars=>
@@ -195,7 +195,7 @@ mainwin_menubar=1
 mainwin_width=1280
 mainwin_height=749
 messagewin_width=600
-messagewin_height=540
+messagewin_height=745
 mimeview_tree_height=60
 sourcewin_width=600
 sourcewin_height=500
diff --git a/.claws-mail/menurc b/.claws-mail/menurc
index fda6c00..0609b41 100644
--- a/.claws-mail/menurc
+++ b/.claws-mail/menurc
@@ -20,7 +20,6 @@
 ; (gtk_accel_path "<Actions>/TextviewPopupFile/TextviewPopupFile/Open" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/InsertFile" "<Primary>i")
 ; (gtk_accel_path "<Actions>/Menu/Configuration/ChangeAccount/pj@pehjota.net" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/MarkAllRead" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/StatusBar" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/RequestRetRcpt" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Priority/Lowest" "")
@@ -46,14 +45,13 @@
 ; (gtk_accel_path "<Actions>/Menu/Edit/SelectAll" "<Primary>a")
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/Unlock" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Korean/EUC-KR" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/MoveFolder" "")
+; (gtk_accel_path "<Actions>/Menu/Configuration/ChangeAccount/patrick.mcdermott@libiquity.com" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/SendLater" "<Primary><Shift>s")
 ; (gtk_accel_path "<ClawsColorLabels>/8" "<Primary>8")
 ; (gtk_accel_path "<Actions>/Menu/Message/Reply" "<Primary>r")
 ; (gtk_accel_path "<Actions>/Menu/Message/Move" "<Primary>o")
 ; (gtk_accel_path "<Actions>/Menu/Options/ReplyMode/All" "")
 ; (gtk_accel_path "<Actions>/MimeView/MimeView" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/CreateNewFolder" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/CollectAddresses" "")
 ; (gtk_accel_path "<Actions>/Menu/SummaryViewPopup" "")
 ; (gtk_accel_path "<Actions>/Menu/File/SaveAs" "<Primary>s")
@@ -65,7 +63,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/WatchThread" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Close" "<Primary>w")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/GB2312" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/CopyFolder" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Cyrillic/KOI8-U" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/CreateFilterRule/Automatically" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/GB18030" "")
@@ -78,6 +75,7 @@
 ; (gtk_accel_path "<ClawsColorLabels>/7" "<Primary>7")
 ; (gtk_accel_path "<Actions>/Menu/Edit/AutoIndent" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/GBK" "")
+; (gtk_accel_path "<ClawsTags>/$MDNSent" "")
 ; (gtk_accel_path "<ClawsColorLabels>/3" "<Primary>3")
 ; (gtk_accel_path "<Actions>/Menu/Message/Receive/CurrentAccount" "<Primary>i")
 ; (gtk_accel_path "<Actions>/Menu/Edit/SpecialPaste" "")
@@ -129,7 +127,6 @@
 ; (gtk_accel_path "<Actions>/Menu/View/Part/OpenWith" "o")
 ; (gtk_accel_path "<Actions>/Menu/Tools/SSLCertificates" "")
 ; (gtk_accel_path "<Actions>/Menu/View/HideReadMessages" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/DeleteFolder" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/ComposeNews" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Part" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/CreateFilterRule/BySubject" "")
@@ -173,7 +170,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Edit/Copy" "<Primary>c")
 ; (gtk_accel_path "<Actions>/Menu/Message/ReplyTo/All" "<Primary><Shift>r")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelEndLine" "<Primary>k")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/CheckNewFolders" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/Toolbar" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/PrevPart" "z")
 ; (gtk_accel_path "<Actions>/Menu/Configuration" "")
@@ -186,8 +182,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Message/Send" "<Primary>Return")
 ; (gtk_accel_path "<Actions>/Menu/Message/Redirect" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Baltic/ISO-8859-13" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/RenameFolder" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Subscriptions" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Priority/Normal" "")
 ; (gtk_accel_path "<Actions>/Menu/View/CollapseThreads" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Japanese/ISO-2022-JP" "")
@@ -247,7 +241,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Message/Reedit" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ThreadView" "<Primary>t")
 ; (gtk_accel_path "<Actions>/Menu/SummaryViewPopup/Tags" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Subscriptions/Subscribe" "")
 ; (gtk_accel_path "<Actions>/MimeView/MimeView/Open" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/UnignoreThread" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/Toolbar/Hide" "")
@@ -255,7 +248,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Edit/Find" "<Primary>f")
 ; (gtk_accel_path "<Actions>/TextviewPopupMail/TextviewPopupMail/Copy" "")
 ; (gtk_accel_path "<Actions>/Menu/Configuration/ChangeAccount" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Synchronise" "")
 ; (gtk_accel_path "<Actions>/Menu/Edit/AutoWrap" "<Primary><Shift>l")
 ; (gtk_accel_path "<Actions>/Menu/View/Layout/Standard" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/MarkHam" "")
@@ -288,10 +280,8 @@
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Sort/Subject" "")
 ; (gtk_accel_path "<Actions>/Menu/Help/FAQ" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/RebuildTree" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/MailingList/Help" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/PrevLabeled" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Subscriptions/Unsubscribe" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/ISO-8859-9" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/CreateProcessingRule" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/ISO-8859-7" "")
@@ -299,7 +289,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Thai/Windows-874" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/ISO-8859-2" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Western/Windows-1252" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/RunProcessing" "")
 ; (gtk_accel_path "<Actions>/MimeView/MimeView/SaveAll" "")
 ; (gtk_accel_path "<Actions>/Menu/File/AddMailbox" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/MailingList/Unsubscribe/PlaceHolder" "")
@@ -359,14 +348,12 @@
 ; (gtk_accel_path "<Actions>/Menu/Tools/FilteringLog" "")
 ; (gtk_accel_path "<Actions>/TextviewPopupLink/TextviewPopupLink" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/AddSenderToAB" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Processing" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Western/ISO-8859-15" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/MailingList/ContactOwner" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Chinese/GBK" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic/ISO-8859-5" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Scroll/PrevLine" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Subscriptions/ShowOnlySubs" "")
 ; (gtk_accel_path "<Actions>/TextviewPopupMail/TextviewPopupMail/Compose" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Hebrew" "")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelBackWord" "")
@@ -376,16 +363,12 @@
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/EUC-TW" "")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/ForwChar" "<Primary><Shift>f")
 ; (gtk_accel_path "<Actions>/TextviewPopupLink/TextviewPopupLink/Open" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Properties" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/CheckNewMessages" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Hebrew" "")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/PrevLine" "<Primary>p")
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/Mark" "<Shift>asterisk")
 ; (gtk_accel_path "<Actions>/Menu/Options/RemoveReferences" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/Template/PlaceHolder" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/SearchFolder" "")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Paste" "<Primary>v")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Arabic/ISO-8859-6" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Decode/QP" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Baltic" "")
@@ -401,7 +384,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Arabic/ISO-8859-6" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Sort/Tag" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/CancelSending" "")
-; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/DownloadMessages" "")
 ; (gtk_accel_path "<ClawsTags>/$label4" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Print" "")
 ; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Baltic" "")
diff --git a/.claws-mail/tagsrc b/.claws-mail/tagsrc
index 4f69708..294cd20 100644
--- a/.claws-mail/tagsrc
+++ b/.claws-mail/tagsrc
@@ -1,6 +1,7 @@
-max_id 5
+max_id 6
 1	$label4
 2	$label5
 3	$label1
 4	$label3
 5	$label2
+6	$MDNSent