corrected message parsing regexp