Fix for incoming mail parsing