Enhancement 57 fix background for white/blacklist

Added with latest mailwatch version, also put mailwatch upgrade in
function to prevent multiple upgrades.