Sorry.
2.63 and I haven't tried 1. A friend suggested 2. To be honest, I never looked up what the differences were.
2 attaches it as text/plain.
I followd qmailrocks.org for the most part interjecting my own tweaks here and there.
I have a similar setup on a test mail server and it encapsulates OK.
To be honest I do not use qmail, I use Postfix (2.1.1) and everything works so far. Do the other things you specify in your local.cf work? You could try with setting required_hits to 0.0, etc
