Request to merge email branch

Line is too long. [82/80]