diff -r 968773a0b6ef -r c8382f7b54ef emailuis/emailui/src/FreestyleEmailUiHtmlViewerView.cpp --- a/emailuis/emailui/src/FreestyleEmailUiHtmlViewerView.cpp Tue Sep 14 20:48:24 2010 +0300 +++ b/emailuis/emailui/src/FreestyleEmailUiHtmlViewerView.cpp Wed Sep 15 11:52:37 2010 +0300 @@ -471,10 +471,18 @@ // --------------------------------------------------------------------------- // hide or show Container ( used for activation of the view ) // -void CFsEmailUiHtmlViewerView::FadeOut(TBool aDirectionOut ) +void CFsEmailUiHtmlViewerView::FadeOut( TBool aDirectionOut ) { FUNC_LOG; - iContainer->MakeVisible(!aDirectionOut); + if ( !iContainer ) + { + TFsEmailUiUtility::ShowErrorNoteL( + R_FREESTYLE_EMAIL_ERROR_GENERAL_UNABLE_TO_COMPLETE, ETrue ); + } + else + { + iContainer->MakeVisible( !aDirectionOut ); + } } @@ -863,7 +871,11 @@ { iMessage = NULL; CancelFetchings(); - CFsEmailUiViewBase::NavigateBackL(); + TUid current = iAppUi.CurrentActiveView()->Id(); + if ( current == this->Id() ) + { + CFsEmailUiViewBase::NavigateBackL(); + } if ( iContainer ) {