HEAD: Revert merge from r4_1_1 that was intended for r4_1+ns3.
HEAD: Revert merge from r4_1_1 that was intended for r4_1+ns3.


git-svn-id: 4a4e6d3f3969003d0af9593019da3e8c357e24a8@9029 6619c942-59fa-0310-bf43-a07aaa81d9ac

wlach/retchmail