--- a/qtmobility/src/messaging/qmessagesortorder_win.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_win.cpp	Mon May 03 13:18:40 2010 +0300
@@ -88,10 +88,10 @@
             QString leftStr;
             QString rightStr;
             foreach (QMessageAddress a, left->to() + left->cc() + left->bcc()) {
-                leftStr.append(a.recipient() + ";");
+                leftStr.append(a.addressee() + ";");
             }
             foreach (QMessageAddress a, right->to() + right->cc() + right->bcc()) {
-                rightStr.append(a.recipient() + ";");
+                rightStr.append(a.addressee() + ";");
             }
             COMPARE(leftStr, rightStr)
         }
@@ -223,7 +223,7 @@
                     result.append(QMessageFilter::byType(QMessage::Mms) & filter);
                     result.append(QMessageFilter::byType(QMessage::Sms) & filter);
                     result.append(QMessageFilter::byType(QMessage::Email) & filter);
-                    result.append(QMessageFilter::byType(QMessage::Xmpp) & filter);
+                    result.append(QMessageFilter::byType(QMessage::InstantMessage) & filter);
                 }
             } break;
             case Read: