Nabi issue resolution for RC19 issues

Change-Id: I99e3379f6fb12c6621fce616cd078657f1351c20
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>

diff --git a/src/MsgMessageData.cpp b/src/MsgMessageData.cpp
index cd72708..a534932 100644 (file)
--- a/src/MsgMessageData.cpp
+++ b/src/MsgMessageData.cpp
@@ -504,6 +504,10 @@ MessageData::InitMessageBody(msg_struct_t pMessageInfo)
        }\r
        else\r
        {\r
+               if (MSG_TYPE_MMS == __messageType)\r
+               {\r
+                       Application::GetInstance()->GetAppResource()->GetString(L"IDS_MSGF_BODY_NO_SUBJECT", __messageBody);\r
+               }\r
                __messageBody.Append(IDS_BLANK_SPACE);\r
        }\r
        AppLogDebug("Fetching message body = [%S] err = [%d]", __messageBody.GetPointer(), (int) err);\r

diff --git a/src/MsgMessagesApp.cpp b/src/MsgMessagesApp.cpp
index 90f82e3..07fb386 100644 (file)
--- a/src/MsgMessagesApp.cpp
+++ b/src/MsgMessagesApp.cpp
@@ -776,8 +776,10 @@ MessagesApp::HandleAppControlRequestReceived(const String& operationId, IList* p
                {
                        Frame* pAppFrame = UiApp::GetInstance()->GetFrame(IDC_FRAME_NAME);
 
-                       if (pAppFrame && pSceneManager->GetCurrentSceneId() == IDSCN_THREAD_LIST_EDITOR)
+                       if (pAppFrame && (pSceneManager->GetCurrentSceneId() == IDSCN_THREAD_LIST_EDITOR || pSceneManager->GetCurrentSceneId() == IDSCN_DRAFT_MESSAGE_LIST_EDITOR
+                                        || pSceneManager->GetCurrentSceneId() == IDSCN_SIM_MESSAGE_LIST_EDITOR || pSceneManager->GetCurrentSceneId() == IDSCN_CB_MESSAGE_LIST_EDITOR))
                        {
+                               AppLogDebug("Thread list edit form entered:");
                                ThreadListForm* pThreadListForm = dynamic_cast<ThreadListForm *>( pAppFrame->GetCurrentForm());
                                if(pThreadListForm && true == pThreadListForm->IsDeletionInProgress())
                                {