Added optional delivery-date to Message and fixed an IDE-warning