Yes, but actually I think it's an even better idea to move this code into a 'public Message restoreToLocalMessage()' method in MessageReference.java. I think it fits better there. Thoughts?