Bug 976503 - Properly handle incoming messages with a 'si-id' field r=julienw