jkf's fix to include '@' as non local msgs indicator