Merge pull request #1 from vazquez/handshake-email

Fixing padding issue shown on Gmail client
Copy change