Bug 830616 - A follow-up for bug 828395 to fix some buggy logic in handling the targets of system message. r=mrbkap,benjaminchen, a=approval-mozilla-b2g18+