Comment 1 for bug 1488656

I believe the code is correct and does what is documented in Defaults.py. If you disagree, please give specific examples of settings, what result they should produce and what they actually produce.

In particular, if REMOVE_DKIM_HEADERS =2, the

if not (mm_cfg.REMOVE_DKIM_HEADERS or mlist.anonymous_list):

is false and doesn't return, and the second

if (mm_cfg.REMOVE_DKIM_HEADERS == 1 and not ...

is also false and does not return and the del statements are executed.

I don't know what you mean by "REMOVE_DKIM_HEADERS = 2 should overwrite the from_is_list == 1." What the documentation says is if REMOVE_DKIM_HEADERS = 2, the headers are removed regardless of the from_is_list setting, and that's what's done.