readded the original MessagingServer