More email package fixes.
1 file changed