--- a/qtmobility/examples/samplephonebook/contacteditor.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contacteditor.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -191,7 +191,7 @@
 
     // avatar viewer
     if (defs.contains(QContactAvatar::DefinitionName)
-        && defs.contains(QContactThumbnail::DefinitionName)) {
+        || defs.contains(QContactThumbnail::DefinitionName)) {
         m_avatarBtn->setEnabled(true);
         QContactAvatar av = curr.detail(QContactAvatar::DefinitionName);
         QContactThumbnail thumb = curr.detail(QContactThumbnail::DefinitionName);
@@ -316,6 +316,7 @@
             curr.saveDetail(&thumb);
         }
 
+        curr = m_manager->compatibleContact(curr);
         bool success = m_manager->saveContact(&curr);
         if (!success)
             QMessageBox::information(this, "Failed!", QString("Failed to save contact!\n(error code %1)").arg(m_manager->error()));