diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2012-11-07 09:23:53 +0000 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2012-11-07 09:23:53 +0000 |
| commit | db6e528d1062f40c1b1ae8270a5f724256649ea0 (patch) | |
| tree | f094a1c0f9d2560aa1fbe01821145b1f2f61bc37 /alot/defaults | |
| parent | fc002480829f900ded44c63132c555e48d238820 (diff) | |
| parent | 7e00dacae94cd26a0892b4e4feda80d259189ee9 (diff) | |
Merge remote-tracking branch 'origin/0.3.3-feature-bounce-524'
Diffstat (limited to 'alot/defaults')
| -rw-r--r-- | alot/defaults/alot.rc.spec | 32 | ||||
| -rw-r--r-- | alot/defaults/default.bindings | 1 |
2 files changed, 24 insertions, 9 deletions
diff --git a/alot/defaults/alot.rc.spec b/alot/defaults/alot.rc.spec index 0550109a..659a06cb 100644 --- a/alot/defaults/alot.rc.spec +++ b/alot/defaults/alot.rc.spec @@ -169,19 +169,33 @@ quote_prefix = string(default='> ') # only if original subject doesn't start with 'Re:' or this prefix reply_subject_prefix = string(default='Re: ') -# Always use the proper realname when constructing "From" headers -# for replies/forwards. Set this to False to use the realname string -# as received in the original message. +# String prepended to subject header on forward +# only if original subject doesn't start with 'Fwd:' or this prefix +forward_subject_prefix = string(default='Fwd: ') + +# Always use the proper realname when constructing "From" headers for replies. +# Set this to False to use the realname string as received in the original message. reply_force_realname = boolean(default=True) -# Always use the accounts main address when constructing "From" headers -# for replies/forwards. Set this to False to use the address string -# as received in the original message. +# Always use the accounts main address when constructing "From" headers for replies. +# Set this to False to use the address string as received in the original message. reply_force_address = boolean(default=False) -# String prepended to subject header on forward -# only if original subject doesn't start with 'Fwd:' or this prefix -forward_subject_prefix = string(default='Fwd: ') +# Always use the proper realname when constructing "From" headers for forwards. +# Set this to False to use the realname string as received in the original message. +forward_force_realname = boolean(default=True) + +# Always use the accounts main address when constructing "From" headers for forwards. +# Set this to False to use the address string as received in the original message. +forward_force_address = boolean(default=False) + +# Always use the proper realname when constructing "Resent-From" headers for bounces. +# Set this to False to use the realname string as received in the original message. +bounce_force_realname = boolean(default=True) + +# Always use the accounts main address when constructing "Resent-From" headers for bounces. +# Set this to False to use the address string as received in the original message. +bounce_force_address = boolean(default=False) # prefer plaintext alternatives over html content in multipart/alternative diff --git a/alot/defaults/default.bindings b/alot/defaults/default.bindings index b565eb5f..50b7f45a 100644 --- a/alot/defaults/default.bindings +++ b/alot/defaults/default.bindings @@ -67,6 +67,7 @@ q = exit f = forward p = print --add_tags n = editnew + b= bounce s = save r = reply | = prompt 'pipeto ' |