--- a/satui/satapp/src/satappview.cpp	Fri Apr 16 15:31:58 2010 +0300
+++ b/satui/satapp/src/satappview.cpp	Mon May 03 13:01:45 2010 +0300
@@ -72,9 +72,9 @@
     TFLOGSTRING("SATAPP: SatAppView::~SatAppView")
     // The objects are outside the object tree, Delete them manually
     if (mTimer) {
-    delete mTimer;
-    mTimer = 0;
-    TFLOGSTRING("SATAPP: SatAppView::~SatAppView delete subtitle")
+        delete mTimer;
+        mTimer = 0;
+        TFLOGSTRING("SATAPP: SatAppView::~SatAppView delete subtitle")
     }
 
     if (mLoop) {
@@ -104,11 +104,9 @@
     // Listwidget
     mListWidget = qobject_cast<HbListWidget *>
         ( mUi->docmlLoader()->findWidget(SATAPP_MENUITEM ));
-    //mMenu = new HbMenu();
     if (mListWidget && mWindow) {
         mSoftKeyQuitAction = new HbAction(Hb::QuitAction,this);
-        HbMenu *addMenu = menu();
-        HbAction *menuAction = addMenu->addAction("Exit");
+        HbAction *menuAction = menu()->addAction("Exit");
         bool ret = connect(menuAction, SIGNAL(triggered()),
                        mSoftKeyQuitAction, SIGNAL(triggered()));
         TFLOGSTRING2("SATAPP: SatAppView::initSetupMenu: \
@@ -117,8 +115,8 @@
                        mWindow, SLOT(close()));
         TFLOGSTRING2("SATAPP: SatAppView::initSetupMenu: \
             quit connected %d", ret)
+    }
 
-    }
     TFLOGSTRING("SATAPP: SatAppView::initSetupMenu exit")
 }
 
@@ -144,13 +142,12 @@
 
     if (mSelectListWidget && mWindow) {
         mSoftKeyBackAction = new HbAction(Hb::BackAction,this);
-        HbMenu *addMenu = menu();
-        HbAction *menuBack = addMenu->addAction("Back");
+        HbAction *menuBack = menu()->addAction("Back");
         bool ret = connect(menuBack, SIGNAL(triggered()),
                        mSoftKeyBackAction, SIGNAL(triggered()));
         TFLOGSTRING2("SATAPP: SatAppView::initSelectItem: \
             menu connected %d", ret)
-        HbAction *menuQuit = addMenu->addAction("Exit");
+        HbAction *menuQuit = menu()->addAction("Exit");
         ret = connect(menuQuit, SIGNAL(triggered()),
                       mWindow, SLOT(close()));
         TFLOGSTRING2("SATAPP: SatAppView::initSelectItem: \
@@ -198,6 +195,7 @@
         }
         // connect setup menu item
         connectItem();
+        setNavigationAction(mSoftKeyQuitAction);
     }
     TFLOGSTRING("SATAPP: SatAppView::SetUpMenu exit")
 }
@@ -229,10 +227,9 @@
     if (mWindow){
         mWindow->setCurrentViewIndex(aDefaultItem);
     }
-
+    
     // Set sub title
     if (!aText.isEmpty()) {
-        TFLOGSTRING2("SATAPP: aText=%s", aText.utf16())
         mSubTitle->setPlainText(aText);
     } else {
         TFLOGSTRING("SATAPP: txt_sat_selectitem_title")
@@ -246,6 +243,12 @@
             mSelectListWidget->addItem(aMenuItems.at( i ));
         }
     }
+    // Set Back key
+    //setSoftkeyBack();
+    if (mSoftKeyBackAction) {
+       setNavigationAction(mSoftKeyBackAction);
+       TFLOGSTRING("SATAPP: SatAppView::selectItem set softkey back")
+    }
     // connect selectitem 
     connectItem();
 
@@ -275,14 +278,13 @@
     } else {
         TFLOGSTRING2("SATAPP: SatAppView::selectItem selected %d",
                       mItemIndex)
-        //TODO: fix this below. 
         //For Demo. We will not return user select item to SIM.
         aSelection = mItemIndex;
     }
    // disconnet select item
     disconnectItem();
     TFLOGSTRING2("SATAPP: SatAppView::selectItem aRes:%d", aRes)
-    mTimeout=false;
+    mTimeout = false;
     TFLOGSTRING("SATAPP: SatAppView::selectItem exit")
 }
 
@@ -336,10 +338,15 @@
 void SatAppView::backButtonClicked()
 {
     TFLOGSTRING("SATAPP: SatAppView::backButtonClicked")
-    if (mSelectItem && mLoop->isRunning() ) {
+    if (mSelectItem) {
         mClickBackSoftkey = true;
         TFLOGSTRING("SATAPP: SatAppView::backButtonClicked back selected")
-        mLoop->exit();
+        if (mLoop) {
+            TFLOGSTRING("SATAPP: SatAppView::backButtonClicked quit loop")
+            if (mLoop->isRunning()) {
+                mLoop->exit();
+            }
+        }
     }
     TFLOGSTRING("SATAPP: SatAppView::backButtonClicked exit")
 }
@@ -369,9 +376,9 @@
     if(mSelectItem && mSelectListWidget) {
         mItemIndex = mSelectListWidget->row(item);
         if (mLoop && mLoop->isRunning()) {
-        TFLOGSTRING( "SATAPP: SatAppView::menuItemSelected sel item")
-        mLoop->quit();
-        TFLOGSTRING( "SATAPP: SatAppView::menuItemSelected exit loop")
+            TFLOGSTRING( "SATAPP: SatAppView::menuItemSelected sel item")
+            mLoop->quit();
+            TFLOGSTRING( "SATAPP: SatAppView::menuItemSelected exit loop")
         }
     } 
     if (!mSelectItem && mListWidget) {