Fixing issue when email has no subject.
Fixing issue when icon is None.