Changed message() to also look in $self->{ messages }