Don't decrement the retrycount anymore and high recovery size

Quick fixes so we "never" lose a message anymore