Kal mar 04

Refresh after tweaking and incorporating changes for the junk mail warning.