Fixing the email viewer a bit