email client bug fix + random term bug fix