Adding correct named class ForwardMessageDto

+ some minor update