fixed message handling regex