[PATCH] Add support for message commands