Bug 844978 - Email Manual Setup Layout and Type updates