Fix regression in 99709718

Message table was emptied before each message was added.
Now it empties only before adding any messages.

Change-Id: I98840ebba4b8307545129a2355e4223e659b0ba4