Feature/mob 2147 swa integration 2

if messages limit is always a positive number, then the second condition is enough, as it will also be true that 0 < MESSAGES_LIMIT