Email Bug Fix