Adjust quote format

3 files changed, 36 insertions, 16 deletions

diff --git a/.claws-mail/clawsrc b/.claws-mail/clawsrc
index 3c3ca51..eadad2e 100644
--- a/.claws-mail/clawsrc
+++ b/.claws-mail/clawsrc
@@ -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=>
diff --git a/.claws-mail/clawsrc.bak b/.claws-mail/clawsrc.bak
index c16f5d9..3c3ca51 100644
--- a/.claws-mail/clawsrc.bak
+++ b/.claws-mail/clawsrc.bak
@@ -150,10 +150,10 @@ summary_col_pos_tags=11
 summary_col_size_mark=10
 summary_col_size_unread=13
 summary_col_size_mime=10
-summary_col_size_subject=450
+summary_col_size_subject=426
 summary_col_size_from=200
 summary_col_size_to=120
-summary_col_size_date=183
+summary_col_size_date=180
 summary_col_size_size=45
 summary_col_size_number=40
 summary_col_size_score=40
@@ -161,31 +161,31 @@ summary_col_size_locked=13
 summary_col_size_tags=150
 folderwin_x=16
 folderwin_y=16
-folderview_width=270
+folderview_width=297
 folderview_height=631
 folderview_visible=1
 folder_col_show_folder=1
 folder_col_show_new=1
 folder_col_show_unread=1
-folder_col_show_total=1
-folder_col_pos_folder=0
-folder_col_pos_new=1
-folder_col_pos_unread=2
-folder_col_pos_total=3
-folder_col_size_folder=120
-folder_col_size_new=32
-folder_col_size_unread=32
+folder_col_show_total=0
+folder_col_pos_folder=1
+folder_col_pos_new=2
+folder_col_pos_unread=3
+folder_col_pos_total=0
+folder_col_size_folder=193
+folder_col_size_new=25
+folder_col_size_unread=40
 folder_col_size_total=32
-summaryview_width=1001
+summaryview_width=974
 summaryview_height=335
 main_messagewin_x=256
 main_messagewin_y=210
-messageview_width=1001
+messageview_width=974
 messageview_height=291
 messageview_visible=1
 mainview_x=64
 mainview_y=64
-mainview_width=1001
+mainview_width=974
 mainview_height=749
 mainwin_x=64
 mainwin_y=64
diff --git a/.claws-mail/menurc b/.claws-mail/menurc
index 39ee762..fda6c00 100644
--- a/.claws-mail/menurc
+++ b/.claws-mail/menurc
@@ -20,6 +20,7 @@
 ; (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" "")
@@ -45,12 +46,14 @@
 ; (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/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")
@@ -62,6 +65,7 @@
 ; (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" "")
@@ -125,6 +129,7 @@
 ; (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" "")
@@ -168,6 +173,7 @@
 ; (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" "")
@@ -180,6 +186,8 @@
 ; (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" "")
@@ -239,6 +247,7 @@
 ; (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" "")
@@ -246,6 +255,7 @@
 ; (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" "")
@@ -278,8 +288,10 @@
 ; (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" "")
@@ -287,6 +299,7 @@
 ; (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" "")
@@ -346,12 +359,14 @@
 ; (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" "")
@@ -361,12 +376,16 @@
 ; (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" "")
@@ -382,6 +401,7 @@
 ; (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" "")