Messages not being sent under specific conditions

@eviltrout something that might be worth having a look at?