Map mail bug fixes

Moderate level bug fixing to the disposal mail system. Functions as intended again.