Restoring support for concatenated messages