messages-rewrite branch.. syntax update