Add include_marker/include_recent_message support