-$im->{want_object_id} = 1 if 'v2';
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
-
-if ('v2') {
- like($im->{last_object_id}, qr/\A[a-f0-9]{40}\z/, 'got last_object_id');
+if ($v2) {
+ like($smsg->{blob}, qr/\A[a-f0-9]{40}\z/, 'got last object_id');
+ is($mime->as_string, ${$smsg->{-raw_email}}, 'string matches');
+ is($smsg->{bytes}, length(${$smsg->{-raw_email}}), 'length matches');