Added support for expired and unconfirmed messages