Fixed some errors from email reader