Minor fixes; should not trigger on quoted messages now