Merge pull request #2866 from ktsaou/units-scaling

properly close the multi-part emails;