Better offline messages handling