Merged r10852 from trunk (#12399)
fix non ASCII attachment filename encoding broken (MOJIBAKE) in receiving mail on Ruby 1.8.
Authored by: tmaruyama 2012-11-21
Parent: [r10853]
Child: [r10855]