Move EEMuffin's functionality to MessageService