Apache mail phone image and pretty html message
Merge remote-tracking branch 'origin/master'