--- a/qtmobility/examples/serviceactions/mainwindow.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/examples/serviceactions/mainwindow.cpp	Mon May 03 13:18:40 2010 +0300
@@ -186,8 +186,17 @@
 void AccountsWidget::load()
 {
     static bool runonce = false;
+    //#define NOTHREAD
+#ifdef NOTHREAD
+    QMessageManager manager;
     if(!runonce)
-        m_loader.start();
+     setIds(manager.queryAccounts());
+    //        m_loader.start();
+
+#else 
+    if(!runonce) 
+         m_loader.start();
+#endif
     runonce = true;
 }
 
@@ -373,6 +382,7 @@
 
 void RecentMessagesWidget::stateChanged(QMessageService::State newState)
 {
+  qDebug() << "stateChanged state=" << m_state << " newState=" << newState << "error=" << m_service->error();
     if (newState == QMessageService::FinishedState) {
         if ((m_state != LoadFailed) && (m_service->error() == QMessageManager::NoError)) {
             m_state = LoadFinished;
@@ -491,13 +501,13 @@
 void RecentMessagesWidget::load()
 {
     m_ids.clear();
+    m_state = Loading;
+    bool b;
 
-    if(!m_service->queryMessages(QMessageFilter(),QMessageSortOrder::byReceptionTimeStamp(Qt::DescendingOrder),m_maxRecent))
-        m_state = LoadFailed;
-    else
-        m_state = Loading;
-}
+    b=m_service->queryMessages(QMessageFilter(),QMessageSortOrder::byReceptionTimeStamp(Qt::DescendingOrder),m_maxRecent);
+    qDebug() << "RecentMessagesWidget::load" << b << m_state;
 //! [load-message]
+};
 
 //! [process-results2]
 void RecentMessagesWidget::processResults()
@@ -881,6 +891,7 @@
 
 void MessageViewWidget::stateChanged(QMessageService::State newState)
 {
+  qDebug() << "stateChanged state=" << m_state << " newState=" << newState << "error=" << m_service->error();
     if (m_state == LoadFailed)
         return;
 
@@ -1022,7 +1033,7 @@
         else
             bodyText = QString("<p align=\"center\"><a href=\"%1\">Download</a></p>").arg(downloadLinkURL());
         m_messageBrowser->setHtml(htmlTemplate\
-                                 .arg(message.from().recipient())\
+                                 .arg(message.from().addressee())\
                                  .arg(message.subject())\
                                  .arg(message.receivedDate().toString())\
                                  .arg(bodyText));
@@ -1264,6 +1275,7 @@
                                                   << new ShowWidget(m_service,this)
                                                   << new RetrieveWidget(this)
                                                   << new StoreSignalsWidget(this)) {
+
         m_widgetStack->addWidget(exampleWidget);
 #ifdef _WIN32_WCE
         exampleWidget->installEventFilter(this);
@@ -1311,6 +1323,7 @@
 
     setWindowTitle(WindowTitle);
     resize(WindowGeometry);
+
 }
 
 #ifdef _WIN32_WCE
@@ -1325,6 +1338,7 @@
 
 void MainWindow::serviceStateChanged(QMessageService::State newState)
 {
+  qDebug() << "MainWindow::serviceStateChanged";
     if ((newState == QMessageService::FinishedState) && (m_service->error() != QMessageManager::NoError))
         QMessageBox::critical(this,"Error","One or more service actions failed");
 }