Removed some more legacy code Added back logic similar to the pre-processing de-duping logic (was resulting in "unsent" messages reappearing) Added a number of updated view files