Pre message handling rewrite commit