Enable deleting of message with claim id

This patch fixes a bug wherein a user was not able to delete
a claimed message due to the claim id not being passed along with
the message id.

Change-Id: If893d2ca9cb1e0ff5fe82cc15e3f2e8dd0ccac3f
Closes-Bug:1325032
Merge "Enable deleting of message with claim id"