Request to merge email branch

Incorrect indentation detected (column 0 instead of 2).<br>Missing space after #.