Changing how the prefix works, so we can build as a subproject.
Adding back in our mail composer typedef, so we can more easily reference it in other places.