Patches for simap,spop certificate check and new check_nntps check [sf#1041571] [#327]