- i.skip_to ("Q");
- if (i != message->doc.termlist_end ())
- return talloc_strdup (message, (*i).c_str () + 1);
- else
+ i.skip_to (_find_prefix ("msgid"));
+
+ /* XXX: This should really be an internal error, but we'll need to
+ * fix the add_message side of things first. */
+ if (i == message->doc.termlist_end ())