fixed and added another regex for complex messages