Service fixed. Add connection type in saving message.