fixed name of general options panel back to display like it was in 3.0.  The General term conflicted with something else and must have gotten lost in the merge
Changed description to be more generic and cover all e-mail types.  REmoved unused extension code.