Added content and client-side email handling