Conditional alerts

Cleaned up message sending to use more common code and be more consistent