Complete the separation of the Mailout from the Base code