fixed name error & allow space before @-command of mms

Signed-off-by: Andrwe Lord Weber <github@andrwe.org>