From 166d6d89ff83e1897450ca84a2a438b5f67d05ce Mon Sep 17 00:00:00 2001
From: Andrzej Krolikowski <a.krolikowsk@samsung.com>
Date: Wed, 25 Sep 2013 12:21:45 +0200
Subject: [PATCH] [Messaging-email] clean up

Change-Id: I7cd5ed94bff3f63bf5381af92498496216189fe9
---
 .../MessageArraySuccessCallback_notexist.html |   4 +-
 ...MessageArraySuccessCallback_onsuccess.html |   9 +-
 ...chmentSuccessCallback_email_onsuccess.html |   8 +-
 ...ageAttachmentSuccessCallback_notexist.html |   4 +-
 .../MessageAttachment_constructor.html        |   7 +-
 ...MessageAttachment_constructor_minargs.html |   7 +-
 .../messaging/MessageAttachment_exist.html    |   4 +-
 .../messaging/MessageAttachment_extend.html   |   6 +-
 .../MessageAttachment_filePath_attribute.html |   8 +-
 .../MessageAttachment_id_attribute.html       |   6 +-
 ...MessageAttachment_messageId_attribute.html |   6 +-
 .../MessageAttachment_mimeType_attribute.html |   6 +-
 ...geBodySuccessCallback_email_onsuccess.html |   9 +-
 .../MessageBodySuccessCallback_notexist.html  |   4 +-
 .../MessageBodySuccessCallback_onsuccess.html |   5 +-
 .../messaging/MessageBody_email_extend.html   |   6 +-
 .../MessageBody_email_htmlBody_attribute.html |   6 +-
 ...ody_email_inlineAttachments_attribute.html |   6 +-
 .../MessageBody_email_loaded_attribute.html   |   6 +-
 ...MessageBody_email_messageId_attribute.html |   6 +-
 ...MessageBody_email_plainBody_attribute.html |   6 +-
 .../messaging/MessageBody_notexist.html       |   4 +-
 ...ersationArraySuccessCallback_notexist.html |   4 +-
 ...rsationArraySuccessCallback_onsuccess.html |   7 +-
 .../MessageConversation_bcc_attribute.html    |   6 +-
 .../MessageConversation_cc_attribute.html     |   9 +-
 .../messaging/MessageConversation_extend.html |   8 +-
 .../MessageConversation_from_attribute.html   |   7 +-
 .../MessageConversation_id_attribute.html     |   8 +-
 .../MessageConversation_isRead_attribute.html |   9 +-
 ...eConversation_lastMessageId_attribute.html |   8 +-
 ...geConversation_messageCount_attribute.html |   8 +-
 .../MessageConversation_notexist.html         |   5 +-
 ...MessageConversation_preview_attribute.html |   8 +-
 ...MessageConversation_subject_attribute.html |   9 +-
 ...ssageConversation_timestamp_attribute.html |   9 +-
 .../MessageConversation_to_attribute.html     |   9 +-
 .../MessageConversation_type_attribute.html   |   8 +-
 ...Conversation_unreadMessages_attribute.html |   8 +-
 ...ionsChangeCallback_conversationsadded.html |   5 +-
 ...geCallback_email_conversationsremoved.html |   8 +-
 ...geCallback_email_conversationsupdated.html |  16 +-
 ...eConversationsChangeCallback_notexist.html |   4 +-
 ...rArraySuccessCallback_email_onsuccess.html |   7 +-
 ...geFolderArraySuccessCallback_notexist.html |   4 +-
 .../MessageFolder_contentType_exist.html      |   3 +-
 ...ageFolder_email_contentType_attribute.html |   6 +-
 .../messaging/MessageFolder_email_extend.html |   5 +-
 .../MessageFolder_email_id_attribute.html     |   6 +-
 .../MessageFolder_email_name_attribute.html   |   6 +-
 ...essageFolder_email_parentId_attribute.html |   6 +-
 .../MessageFolder_email_path_attribute.html   |   6 +-
 ...ssageFolder_email_serviceId_attribute.html |   5 +-
 ...Folder_email_synchronizable_attribute.html |   6 +-
 .../MessageFolder_email_type_attribute.html   |   6 +-
 .../messaging/MessageFolder_id_exist.html     |   3 +-
 .../messaging/MessageFolder_notexist.html     |   4 +-
 .../messaging/MessageFolder_path_exist.html   |   3 +-
 .../messaging/MessageFolder_type_exist.html   |   3 +-
 ...MessageFoldersChangeCallback_notexist.html |   4 +-
 .../MessageManagerObject_messaging.html       |   4 +-
 .../MessageManagerObject_notexist.html        |   4 +-
 ...ageRecipientsCallback_email_onsuccess.html |   7 +-
 .../MessageRecipientsCallback_notexist.html   |   4 +-
 ...eArraySuccessCallback_email_onsuccess.html |   6 +-
 ...eServiceArraySuccessCallback_notexist.html |   4 +-
 ...ServiceArraySuccessCallback_onsuccess.html |   3 +-
 .../MessageService_email_extend.html          |   7 +-
 .../MessageService_email_id_attribute.html    |   4 +-
 ...geService_email_loadMessageAttachment.html |   9 +-
 ...ageAttachment_attachment_TypeMismatch.html |   7 +-
 ...ssageAttachment_attachment_invalid_cb.html |   7 +-
 ...Attachment_errorCallback_TypeMismatch.html |   7 +-
 ...geAttachment_errorCallback_invalid_cb.html |   7 +-
 ...ice_email_loadMessageAttachment_exist.html |   9 +-
 ...e_email_loadMessageAttachment_missarg.html |   7 +-
 ...tachment_successCallback_TypeMismatch.html |   7 +-
 ...Attachment_successCallback_invalid_cb.html |   7 +-
 ...ssageAttachment_without_errorCallback.html |   9 +-
 .../MessageService_email_loadMessageBody.html |   3 +-
 ...essageBody_errorCallback_TypeMismatch.html |   3 +-
 ...dMessageBody_errorCallback_invalid_cb.html |   3 +-
 ...geService_email_loadMessageBody_exist.html |   9 +-
 ...Service_email_loadMessageBody_missarg.html |   9 +-
 ...email_loadMessageBody_missarg_message.html |  11 +-
 ...sageBody_successCallback_TypeMismatch.html |   7 +-
 ...essageBody_successCallback_invalid_cb.html |   5 +-
 ...il_loadMessageBody_with_errorCallback.html |   3 +-
 ...ervice_email_messageStorage_attribute.html |   8 +-
 .../MessageService_email_name_attribute.html  |   4 +-
 .../MessageService_email_sendMessage.html     |   5 +-
 ...endMessage_errorCallback_TypeMismatch.html |   7 +-
 ..._sendMessage_errorCallback_invalid_cb.html |  11 +-
 ...essageService_email_sendMessage_exist.html |   9 +-
 ...mail_sendMessage_message_TypeMismatch.html |   7 +-
 ...email_sendMessage_message_invalid_obj.html |   7 +-
 ...sageService_email_sendMessage_missarg.html |   7 +-
 ...dMessage_successCallback_TypeMismatch.html |   6 +-
 ...endMessage_successCallback_invalid_cb.html |   9 +-
 ...ail_sendMessage_without_errorCallback.html |   7 +-
 ...l_sendMessage_without_successCallback.html |   7 +-
 .../MessageService_email_stopSync_exist.html  |   9 +-
 ...MessageService_email_syncFolder_exist.html |   9 +-
 .../MessageService_email_sync_exist.html      |   9 +-
 .../MessageService_email_type_attribute.html  |   9 +-
 .../messaging/MessageService_notexist.html    |   4 +-
 ...ssageService_sendMessage_emailWithBcc.html |  11 +-
 ...Service_sendMessage_emailWithPriority.html |  13 +-
 ...e_sendMessage_email_without_callbacks.html |   8 +-
 .../MessageService_stopSync_sync.html         |   3 +-
 .../MessageService_stopSync_syncFolder.html   |   5 +-
 .../messaging/MessageService_sync.html        |   3 +-
 .../messaging/MessageService_syncFolder.html  |   3 +-
 ...syncFolder_errorCallback_TypeMismatch.html |   3 +-
 ...e_syncFolder_errorCallback_invalid_cb.html |   3 +-
 ...ervice_syncFolder_folder_TypeMismatch.html |   3 +-
 .../MessageService_syncFolder_missarg.html    |   3 +-
 ...ncFolder_successCallback_TypeMismatch.html |   7 +-
 ...syncFolder_successCallback_invalid_cb.html |   3 +-
 ...Service_syncFolder_with_errorCallback.html |   3 +-
 .../MessageService_syncFolder_with_limit.html |   7 +-
 ...rvice_syncFolder_with_successCallback.html |   3 +-
 ...MessageService_sync_emailwithoutparam.html |   1 +
 ...rvice_sync_errorCallback_TypeMismatch.html |   3 +-
 ...Service_sync_errorCallback_invalid_cb.html |   3 +-
 .../MessageService_sync_foremail.html         |   6 +-
 ...ice_sync_successCallback_TypeMismatch.html |   3 +-
 ...rvice_sync_successCallback_invalid_cb.html |   3 +-
 ...essageService_sync_with_errorCallback.html |   3 +-
 .../MessageService_sync_with_limit.html       |   3 +-
 ...sageService_sync_with_successCallback.html |   5 +-
 ...torage_addConversationsChangeListener.html |   3 +-
 ...onsChangeListener_filter_TypeMismatch.html |   5 +-
 ...ddConversationsChangeListener_missarg.html |   9 +-
 ...nversationsChangeListener_with_filter.html |   3 +-
 ...ConversationsChangeListener_withoutcb.html |   7 +-
 ...onversationsChangeCallback_invalid_cb.html |   9 +-
 ..._addConversationsChangeListener_exist.html |   6 +-
 .../MessageStorage_email_addDraftMessage.html |   6 +-
 ...aftMessage_errorCallback_TypeMismatch.html |   7 +-
 ...DraftMessage_errorCallback_invalid_cb.html |   6 +-
 ...geStorage_email_addDraftMessage_exist.html |   6 +-
 ..._addDraftMessage_message_TypeMismatch.html |   6 +-
 ...l_addDraftMessage_message_invalid_obj.html |   6 +-
 ...Storage_email_addDraftMessage_missarg.html |   6 +-
 ...tMessage_successCallback_TypeMismatch.html |   6 +-
 ...aftMessage_successCallback_invalid_cb.html |   7 +-
 ...addDraftMessage_without_errorCallback.html |   6 +-
 ...dDraftMessage_without_successCallback.html |   6 +-
 ...torage_email_addFoldersChangeListener.html |  12 +-
 ..._email_addFoldersChangeListener_exist.html |   6 +-
 ...ersChangeListener_filter_TypeMismatch.html |   8 +-
 ...er_foldersChangeCallback_TypeMismatch.html |  10 +-
 ...l_addFoldersChangeListener_invalid_cb.html |   3 +-
 ...mail_addFoldersChangeListener_missarg.html |   5 +-
 ..._addFoldersChangeListener_with_filter.html |  12 +-
 ...email_addMessagesChangeListener_exist.html |   6 +-
 ...gesChangeListener_filter_TypeMismatch.html |   7 +-
 ...r_messagesChangeCallback_TypeMismatch.html |   7 +-
 ...ner_messagesChangeCallback_invalid_cb.html |   7 +-
 ...ail_addMessagesChangeListener_missarg.html |   7 +-
 ...addMessagesChangeListener_with_filter.html |   7 +-
 ...MessagesChangeListener_without_filter.html |   7 +-
 .../MessageStorage_email_extend.html          |   6 +-
 ...Storage_email_findConversations_exist.html |   6 +-
 ...e_email_findConversations_filter_from.html |   5 +-
 ...age_email_findConversations_filter_to.html |   6 +-
 ...e_email_findConversations_filter_type.html |   5 +-
 ...age_email_findConversations_with_sort.html |   5 +-
 ...findConversations_with_sort_time_desc.html |   2 +-
 ...ndConversations_without_errorCallback.html |   5 +-
 ...essageStorage_email_findFolders_exist.html |   6 +-
 .../MessageStorage_email_findMessages.html    |   6 +-
 ...mail_findMessages_and_loadMessageBody.html |  10 +-
 ...l_findMessages_bcc_with_errorCallback.html |   8 +-
 ...il_findMessages_cc_with_errorCallback.html |   7 +-
 ...ssageStorage_email_findMessages_exist.html |   6 +-
 ...dMessages_folderId_with_errorCallback.html |   6 +-
 ..._findMessages_from_with_errorCallback.html |   6 +-
 ...ages_hasAttachment_with_errorCallback.html |   6 +-
 ...il_findMessages_id_with_errorCallback.html |   7 +-
 ...ges_isHighPriority_with_errorCallback.html |   7 +-
 ...indMessages_isRead_with_errorCallback.html |   7 +-
 ...Messages_plainBody_with_errorCallback.html |   8 +-
 ...Messages_serviceId_with_errorCallback.html |   9 +-
 ...Messages_timestamp_with_errorCallback.html |   6 +-
 ...il_findMessages_to_with_errorCallback.html |   6 +-
 ..._findMessages_type_with_errorCallback.html |   6 +-
 ...rage_email_removeChangeListener_exist.html |   7 +-
 ...orage_email_removeConversations_exist.html |   7 +-
 ...ageStorage_email_removeMessages_exist.html |   7 +-
 .../MessageStorage_email_updateMessages.html  |  11 +-
 ...teMessages_errorCallback_TypeMismatch.html |   7 +-
 ...dateMessages_errorCallback_invalid_cb.html |   7 +-
 ...ageStorage_email_updateMessages_exist.html |   6 +-
 ..._updateMessages_messages_TypeMismatch.html |   7 +-
 ...eStorage_email_updateMessages_missarg.html |   6 +-
 ...Messages_successCallback_TypeMismatch.html |   6 +-
 ...teMessages_successCallback_invalid_cb.html |   7 +-
 ..._updateMessages_without_errorCallback.html |  13 +-
 ...pdateMessages_without_successCallback.html |  10 +-
 .../messaging/MessageStorage_findFolders.html |   6 +-
 ...indFolders_errorCallback_TypeMismatch.html |  11 +-
 ..._findFolders_errorCallback_invalid_cb.html |  10 +-
 ...orage_findFolders_filter_TypeMismatch.html |  13 +-
 ...eStorage_findFolders_filter_serviceId.html |   6 +-
 .../MessageStorage_findFolders_missarg.html   |  10 +-
 ...dFolders_successCallback_TypeMismatch.html |  11 +-
 ...indFolders_successCallback_invalid_cb.html |   9 +-
 ...torage_findFolders_with_errorCallback.html |   6 +-
 .../messaging/MessageStorage_notexist.html    |   4 +-
 .../MessageStorage_removeChangeListener.html  |   5 +-
 .../MessageStorage_removeConversations.html   |   4 +-
 ...versations_conversations_TypeMismatch.html |   5 +-
 ...versations_errorCallback_TypeMismatch.html |   4 +-
 ...onversations_errorCallback_invalid_cb.html |   4 +-
 ...eStorage_removeConversations_foremail.html |   4 +-
 ...geStorage_removeConversations_missarg.html |   4 +-
 ...rsations_successCallback_TypeMismatch.html |   4 +-
 ...versations_successCallback_invalid_cb.html |   4 +-
 ...emoveConversations_with_errorCallback.html |   4 +-
 ...oveConversations_with_successCallback.html |   4 +-
 ...orage_removeMessage_emailwithouterrcb.html |   1 +
 .../MessageStorage_removeMessages_email.html  |   6 +-
 ...ages_email_errorCallback_TypeMismatch.html |   8 +-
 ...ssages_email_errorCallback_invalid_cb.html |  10 +-
 ...eMessages_email_messages_TypeMismatch.html |   8 +-
 ...eStorage_removeMessages_email_missarg.html |   8 +-
 ...es_email_successCallback_TypeMismatch.html |   8 +-
 ...ages_email_successCallback_invalid_cb.html |  10 +-
 ...moveMessages_email_with_errorCallback.html |   6 +-
 ...veMessages_email_with_successCallback.html |   7 +-
 .../messaging/Message_addUpdateRemove.html    |   6 +-
 .../messaging/Message_attachments_exist.html  |   4 +-
 .../Message_email_attachments_attribute.html  |   8 +-
 .../Message_email_bcc_attribute.html          |   8 +-
 .../Message_email_body_attribute.html         |   6 +-
 .../messaging/Message_email_cc_attribute.html |   6 +-
 .../messaging/Message_email_constructor.html  |   8 +-
 ..._constructor_messageInitDict_function.html |   6 +-
 ...il_constructor_messageInitDict_object.html |   6 +-
 .../Message_email_constructor_minargs.html    |   8 +-
 ...essage_email_conversationId_attribute.html |   6 +-
 .../messaging/Message_email_extend.html       |   6 +-
 .../Message_email_folderId_attribute.html     |   6 +-
 .../Message_email_from_attribute.html         |   8 +-
 ...Message_email_hasAttachment_attribute.html |   6 +-
 .../messaging/Message_email_id_attribute.html |   6 +-
 .../Message_email_inResponseTo_attribute.html |   6 +-
 ...essage_email_isHighPriority_attribute.html |   6 +-
 .../Message_email_isRead_attribute.html       |   6 +-
 ...Message_email_messageStatus_attribute.html |   6 +-
 .../Message_email_subject_attribute.html      |   6 +-
 .../Message_email_timestamp_attribute.html    |   6 +-
 .../messaging/Message_email_to_attribute.html |   6 +-
 .../Message_email_type_attribute.html         |   6 +-
 .../messaging/Message_exist.html              |   4 +-
 .../Message_hasAttachment_exist.html          |   3 +-
 ...lback_email_messagesadded_with_filter.html |  10 +-
 ...ck_email_messagesadded_without_filter.html |   8 +-
 ...ack_email_messagesremoved_with_filter.html |   8 +-
 ..._email_messagesremoved_without_filter.html |   8 +-
 ...ack_email_messagesupdated_with_filter.html |   8 +-
 ..._email_messagesupdated_without_filter.html |   8 +-
 .../MessagesChangeCallback_notexist.html      |   4 +-
 .../Messaging_email_getMessageServices.html   |   6 +-
 ...geServices_errorCallback_TypeMismatch.html |   6 +-
 ...sageServices_errorCallback_invalid_cb.html |   6 +-
 ...Services_successCallback_TypeMismatch.html |   6 +-
 ...geServices_successCallback_invalid_cb.html |   6 +-
 ...getMessageServices_with_errorCallback.html |   6 +-
 .../messaging/Messaging_extend.html           |   4 +-
 .../Messaging_getMessageServices_exist.html   |   7 +-
 ...vices_messageServiceType_TypeMismatch.html |   6 +-
 .../Messaging_getMessageServices_missarg.html |   7 +-
 .../messaging/Messaging_notexist.html         |   4 +-
 .../tests.full.xml                            | 374 +++++++++---------
 tct-messaging-email-tizen-tests/tests.xml     |   8 +-
 278 files changed, 1116 insertions(+), 1015 deletions(-)

diff --git a/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_notexist.html
index 0e815512b..c99538b39 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageArraySuccessCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_onsuccess.html
index a709332d3..73e2f9f66 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageArraySuccessCallback_onsuccess.html
@@ -17,10 +17,10 @@ limitations under the License.
 
 
 Authors:
-Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageArraySuccessCallback_onsuccess</title>
 <meta charset="utf-8">
@@ -33,7 +33,7 @@ Roman Frolow <r.frolow@samsung.com>
 //==== TEST: MessageArraySuccessCallback_onsuccess
 //==== LABEL Check if method onsuccess of MessageArraySuccessCallback works
 //==== SPEC Tizen Web API:Communication:Messaging:MessageArraySuccessCallback:onsuccess M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== PRIORITY P2
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -56,7 +56,7 @@ t.step(function () {
     });
 
     addDraftSuccess = t.step_func(function () {
-        findFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id)
+        findFilter = new tizen.AttributeFilter("id", "EXACTLY", message.id);
         service.messageStorage.findMessages(findFilter, findMessagesSuccess, findMessagesError);
     });
 
@@ -78,6 +78,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
index e84b05f9c..ff2ad8791 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_email_onsuccess.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachmentSuccessCallback_email_onsuccess</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P1
 //==== LABEL Check if callback is called and if its arguments have proper type - MessageAttachmentSuccessCallback, onsuccess, email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachmentSuccessCallback:onsuccess M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBT CBOA
@@ -136,7 +136,7 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
 
 </script>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_notexist.html
index ee9b8f909..45f955dc0 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachmentSuccessCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachmentSuccessCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor.html
index 5d8508183..2d0148abf 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_constructor</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageAttachment_constructor
 //==== LABEL check new tizen.MessageAttachment(String filePath, String mimeType?) works (is supported)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:constructor C
-//==== SPEC_URL TBD
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CONSTRA CONSTRM
 
 test(function () {
@@ -47,6 +47,7 @@ test(function () {
     assert_equals(attachment.filePath, MESSAGE_ATTACHMENT_IMAGE_PATH, "'attachment.filePath' should be \""+MESSAGE_ATTACHMENT_IMAGE_PATH+"\"");
 
 }, "MessageAttachment_constructor");
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor_minargs.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor_minargs.html
index 29f2326e3..d5feaa9d4 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor_minargs.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_constructor_minargs.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_constructor_minargs</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageAttachment_constructor_minargs
 //==== LABEL check new tizen.MessageAttachment(String filePath) works (is supported)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:constructor C
-//==== SPEC_URL TBD
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CONSTRM
 
 test(function () {
@@ -47,6 +47,7 @@ test(function () {
     assert_equals(attachment.filePath, MESSAGE_ATTACHMENT_IMAGE_PATH, "'attachment.filePath' should be \""+MESSAGE_ATTACHMENT_IMAGE_PATH+"\" by default");
 
 }, "MessageAttachment_constructor_minargs");
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_exist.html
index e0f75f488..c858510f3 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_exist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_extend.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_extend.html
index c31dfa3b9..f32c1dfa5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_extend.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_extend</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P3
 //==== LABEL Check if instance of interface MessageAttachment can be extended with new property
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:MessageAttachment U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html
index 08f866017..ae4ff9b3f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_filePath_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_filePath_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageAttachment_filePath_attribute
 //==== LABEL Check if attribute filePath of MessageAttachment exists, has type DOMString and is readonly
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:filePath A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT ADV
@@ -115,7 +115,7 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
 
 </script>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_id_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_id_attribute.html
index 3b13b26f8..be3a84912 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_id_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_id_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_id_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageAttachment_id_attribute
 //==== LABEL Check if attribute id of MessageAttachment exists, has type MessageAttachmentId and is readonly
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:id A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO ADV AT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_messageId_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_messageId_attribute.html
index aef978329..5f967afe8 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_messageId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_messageId_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_messageId_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageAttachment_messageId_attribute
 //==== LABEL Check if attribute messageId of MessageAttachment exists, has type MessageId and is readonly
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:messageId A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO ADV AT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_mimeType_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_mimeType_attribute.html
index 539727268..8bc646e15 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageAttachment_mimeType_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageAttachment_mimeType_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageAttachment_mimeType_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageAttachment_mimeType_attribute
 //==== LABEL Check if attribute mimeType of MessageAttachment exists, has type DOMString and is readonly
 //==== SPEC Tizen Web API:Communication:Messaging:MessageAttachment:mimeType A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE ADV ARO AT
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html
index d12da4a23..68471b3af 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_email_onsuccess.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBodySuccessCallback_email_onsuccess</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P3
 //==== LABEL Check if callback is called and if its arguments have proper type (email message)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBodySuccessCallback:onsuccess U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBT CBOA
@@ -113,8 +113,9 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_notexist.html
index 7ff01a7b8..418347e23 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBodySuccessCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html
index e962f009d..a0f5be088 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBodySuccessCallback_onsuccess.html
@@ -47,7 +47,7 @@ Authors:
 //==== PRIORITY P3
 //==== LABEL Check if callback is called and if its arguments have proper type
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBodySuccessCallback:onsuccess U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA
@@ -116,8 +116,9 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_extend.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_extend.html
index b2b3ce6d7..601602bb1 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_extend.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_email_extend</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== PRIORITY P3
 //==== LABEL Check if instance of interface MessageBody (email) can be extended with new property
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBody:MessageBody U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_htmlBody_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_htmlBody_attribute.html
index 632bd1ee5..5d9bb1bc0 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_htmlBody_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_htmlBody_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_email_htmlBody_attribute</title>
 <meta charset="utf-8"/>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageBody_email_htmlBody_attribute
 //==== LABEL Check if attribute htmlBody of MessageBody (email) exists, has type DOMString
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBody:htmlBody A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE AN ADV AT ASG
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_inlineAttachments_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_inlineAttachments_attribute.html
index e2e1b7abf..8294756c5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_inlineAttachments_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_inlineAttachments_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_email_inlineAttachments_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageBody_email_inlineAttachments_attribute
 //==== LABEL Check if attribute inlineAttachments of MessageBody (email) exists, has type Array
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBody:inlineAttachments A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE AN AT ASG
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_loaded_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_loaded_attribute.html
index 42a052891..e1abd0687 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_loaded_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_loaded_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_email_loaded_attribute</title>
 <meta charset="utf-8"/>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageBody_email_loaded_attribute
 //==== LABEL Check if attribute loaded of MessageBody (email) exists, has type Boolean and is readonly
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBody:loaded A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE AT ARO ADV
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_messageId_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_messageId_attribute.html
index 93d3c0266..41e8dcad5 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_messageId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_messageId_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_email_messageId_attribute</title>
 <meta charset="utf-8"/>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageBody_email_messageId_attribute
 //==== LABEL Check if attribute messageId of MessageBody (email) exists, has type MessageId and is readonly
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBody:messageId A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE AT ARO
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_plainBody_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_plainBody_attribute.html
index 3a1258b1b..bd6dff620 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_email_plainBody_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_email_plainBody_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_email_plainBody_attribute</title>
 <meta charset="utf-8"/>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageBody_email_plainBody_attribute
 //==== LABEL Check if attribute plainBody of MessageBody (email) exists, has type DOMString
 //==== SPEC Tizen Web API:Communication:Messaging:MessageBody:plainBody A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE AT AN ASG
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageBody_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageBody_notexist.html
index 1b6819c6c..57be5c3d6 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageBody_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageBody_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageBody_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_notexist.html
index 8d7345913..e48f87e1a 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversationArraySuccessCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess.html
index 5b0dc6a0b..e277962df 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversationArraySuccessCallback_onsuccess.html
@@ -17,10 +17,10 @@ limitations under the License.
 
 
 Authors:
-Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 
 <head>
 <title>MessageConversationArraySuccessCallback_onsuccess</title>
@@ -34,7 +34,7 @@ Roman Frolow <r.frolow@samsung.com>
 //==== TEST: MessageConversationArraySuccessCallback_onsuccess
 //==== LABEL Check if method onsuccess of MessageConversationArraySuccessCallback works
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversationArraySuccessCallback:onsuccess M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== PRIORITY P2
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -92,6 +92,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_bcc_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_bcc_attribute.html
index a25a08e33..ffb6ba10b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_bcc_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_bcc_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_bcc_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageConversation_bcc_attribute
 //==== LABEL Check attribute bcc of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:bcc A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_cc_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_cc_attribute.html
index fd8c620fd..59771c6d2 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_cc_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_cc_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_cc_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_cc_attribute
 //==== LABEL Check attribute cc of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:cc A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_cc_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "cc", "MessageConversation does not own cc property.");
 
     assert_type(conversation.cc, "array", "Not an array");
@@ -52,6 +52,7 @@ message_conversation_test(t, function(service, message, conversation) {
 
     t.done();
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_extend.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_extend.html
index c73b78103..34a43fa3e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_extend.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_extend</title>
 <meta charset="utf-8"/>
@@ -34,14 +34,14 @@ Authors:
 //==== PRIORITY P3
 //==== LABEL Check if instance of interface MessageConversation can be extended with new property
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:MessageConversation U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA OBX
 setup({timeout: 180000});
 var t = async_test("MessageConversation_extend", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     check_extensibility(conversation);
     t.done();
 });
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html
index ad7dc6208..01daa49cc 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_from_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_from_attribute</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageConversation_from_attribute
 //==== LABEL Check attribute from of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:from A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
@@ -92,6 +92,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_id_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_id_attribute.html
index 5e605a502..26019223e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_id_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_id_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_id_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST MessageConversation_id_attribute
 //==== LABEL Check attribute id of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:id A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_id_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "id", "MessageConversation does not own id property.");
 
     check_readonly(conversation, "id", conversation.id, "string", null);
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_isRead_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_isRead_attribute.html
index 00251ef93..f801b7737 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_isRead_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_isRead_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_isRead_attribute</title>
 <meta charset="utf-8"/>
@@ -33,19 +33,20 @@ Authors:
 //==== TEST: MessageConversation_isRead_attribute
 //==== LABEL Check attribute isRead of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:isRead A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_isRead_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "isRead", "MessageConversation does not own isRead property.");
     check_readonly(conversation, "isRead", conversation.isRead, "boolean", null);
 
     t.done();
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_lastMessageId_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_lastMessageId_attribute.html
index 75bc8a28b..eec878883 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_lastMessageId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_lastMessageId_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_lastMessageId_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_lastMessageId_attribute
 //==== LABEL Check attribute lastMessageId of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:lastMessageId A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_lastMessageId_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "lastMessageId", "MessageConversation does not own lastMessageId property.");
 
     check_readonly(conversation, "lastMessageId", conversation.lastMessageId, "string", null);
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_messageCount_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_messageCount_attribute.html
index 72b0e495c..e338fe57c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_messageCount_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_messageCount_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_messageCount_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_messageCount_attribute
 //==== LABEL Check attribute messageCount of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:messageCount A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_messageCount_attribute", {timeout: 180000}), testing;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "messageCount", "MessageConversation does not own messageCount property.");
 
     check_readonly(conversation, "messageCount", conversation.messageCount, "number", null);
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_notexist.html
index 6354cd780..bc619d193 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_notexist</title>
 <meta charset="utf-8"/>
@@ -39,6 +39,7 @@ Authors:
 test(function () {
     check_no_interface_object("MessageConversation");
 }, document.title);
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_preview_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_preview_attribute.html
index 33aaa813c..d2897813e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_preview_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_preview_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_preview_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_preview_attribute
 //==== LABEL Check attribute preview of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:preview A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_preview_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "preview", "MessageConversation does not own preview property.");
 
     check_readonly(conversation, "preview", conversation.preview, "string", "aaa");
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_subject_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_subject_attribute.html
index e0351d701..98d47be99 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_subject_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_subject_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_subject_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_subject_attribute
 //==== LABEL Check attribute subject of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:subject A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_subject_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "subject", "MessageConversation does not own subject property.");
 
     check_readonly(conversation, "subject", conversation.subject, "string", null);
@@ -48,6 +48,7 @@ message_conversation_test(t, function(service, message, conversation) {
     assert_true(conversation.subject !== "", "subject should be null or non empty string");
     t.done();
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_timestamp_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_timestamp_attribute.html
index 7521103b3..0fc2b6461 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_timestamp_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_timestamp_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_timestamp_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_timestamp_attribute
 //==== LABEL Check attribute timestamp of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:timestamp A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_timestamp_attribute", {timeout: 180000}), tmp;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "timestamp", "MessageConversation does not own timestamp property.");
 
     assert_type(conversation.timestamp, "Date", "Type of timestamp is different.");
@@ -51,6 +51,7 @@ message_conversation_test(t, function(service, message, conversation) {
 
     t.done();
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_to_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_to_attribute.html
index 41b90ecd6..6406ba4cc 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_to_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_to_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_to_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_to_attribute
 //==== LABEL Check attribute to of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:to A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_to_attribute", {timeout: 180000}), tmp;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "to", "MessageConversation does not own to property.");
 
     assert_type(conversation.to, "array", "Not an array");
@@ -52,6 +52,7 @@ message_conversation_test(t, function(service, message, conversation) {
 
     t.done();
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_type_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_type_attribute.html
index 3ec69f0d3..cfdfac3f6 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_type_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_type_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_type_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_type_attribute
 //==== LABEL Check attribute type of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:type A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_type_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "type", "MessageConversation does not own type property.");
     check_readonly(conversation, "type", conversation.type, "string", null);
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversation_unreadMessages_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageConversation_unreadMessages_attribute.html
index 5ce00dfcc..55b511750 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversation_unreadMessages_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversation_unreadMessages_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Roman Frolow <r.frolow@samsung.com>
+        Roman Frolow <r.frolow@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversation_unreadMessages_attribute</title>
 <meta charset="utf-8"/>
@@ -33,14 +33,14 @@ Authors:
 //==== TEST: MessageConversation_unreadMessages_attribute
 //==== LABEL Check attribute unreadMessages of MessageConversation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversation:unreadMessages A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 var t = async_test("MessageConversation_unreadMessages_attribute", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_own_property(conversation, "unreadMessages", "MessageConversation does not own unreadMessages property.");
     check_readonly(conversation, "unreadMessages", conversation.unreadMessages, "number", conversation.unreadMessages + 1);
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded.html b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded.html
index 31e4237f0..2ffd94105 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_conversationsadded.html
@@ -45,7 +45,7 @@ Authors:
 //==== LABEL: Check if conversationsadded callback was invoked with proper argument type.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsadded M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
@@ -86,7 +86,7 @@ t.step(function () {
                     t.done();
                     break;
                 }
-            }           
+            }
         }),
     };
 
@@ -110,6 +110,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsremoved.html b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsremoved.html
index 804658315..9a104bf8e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsremoved.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsremoved.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversationsChangeCallback_email_conversationsremoved</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageConversationsChangeCallback_email_conversationsremoved
 //==== LABEL Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsremoved, email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsremoved M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
@@ -113,7 +113,7 @@ t.step(function () {
     serviceError = t.step_func(function (error) {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
-    
+
     getEmailService(t, serviceSuccess, serviceError);
 });
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsupdated.html b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsupdated.html
index 974f2f6ff..e02ab9276 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsupdated.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_email_conversationsupdated.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversationsChangeCallback_email_conversationsupdated</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageConversationsChangeCallback_email_conversationsupdated
 //==== LABEL Check if callback is called and if its arguments have proper type - MessageConversationsChangeCallback, conversationsupdated, email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageConversationsChangeCallback:conversationsupdated M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBT CBOA
@@ -41,11 +41,11 @@ setup({ timeout: 180000 });
 var t = async_test("MessageConversationsChangeCallback_email_conversationsupdated", {timeout: 180000}),
     serviceSuccess, serviceError, messageService, messageStorage, message,
     addDraftSuccess, addDraftError, updateError, oldTimestamp, changeCallback, listenerId;
-    
+
 t.step(function () {
 
     //cleanup after TC
-    add_result_callback(function() {
+    add_result_callback(function () {
         try {
             messageStorage.removeChangeListener(listenerId);
         } catch (err) {
@@ -54,10 +54,10 @@ t.step(function () {
     });
 
     changeCallback = {
-        conversationsupdated: t.step_func(function(updatedConversations) {
+        conversationsupdated: t.step_func(function (updatedConversations) {
             assert_type(updatedConversations, "array", "Not an array");
             assert_greater_than(updatedConversations.length, 0, "Received empty conversations array");
-            
+
             for (var i in updatedConversations) {
                 if (updatedConversations[i].id === message.conversationId) {
                     check_readonly(updatedConversations[i], "id", updatedConversations[i].id, "string", "dummyValue");
@@ -80,7 +80,7 @@ t.step(function () {
                     t.done();
                     break;
                 }
-            }            
+            }
         })
     };
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_notexist.html
index fa297fb7c..a43ac6ec3 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageConversationsChangeCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageConversationsChangeCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_email_onsuccess.html
index be61a89c0..95fc739e5 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_email_onsuccess.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolderArraySuccessCallback_email_onsuccess</title>
 <meta charset="utf-8"/>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageFolderArraySuccessCallback_email_onsuccess
 //==== LABEL Check if callback is called and if its arguments have proper type - MessageFolderArraySuccessCallback, email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolderArraySuccessCallback:onsuccess M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
@@ -80,7 +80,6 @@ t.step(function () {
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
 
-
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_notexist.html
index cca69f383..041fcfaa3 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolderArraySuccessCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolderArraySuccessCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_contentType_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_contentType_exist.html
index a06f1f3ae..11eb33dd8 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_contentType_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_contentType_exist.html
@@ -48,7 +48,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:contentType A
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html 
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE
 setup({timeout: 180000});
 
@@ -79,6 +79,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", getMessageServicesSuccess, getMessageServicesError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_contentType_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_contentType_attribute.html
index d14b89b7d..cf3b0e7f5 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_contentType_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_contentType_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_contentType_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:contentType A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_extend.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_extend.html
index a76e88f1b..18581e1c4 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_extend.html
@@ -16,7 +16,7 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
 <html>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:MessageFolder U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 setup({timeout: 180000});
 
@@ -71,6 +71,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_id_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_id_attribute.html
index 000dd8ab1..9b89ad338 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_id_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_id_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_id_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:id A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_name_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_name_attribute.html
index ab1905a15..5b535b7f1 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_name_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_name_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_name_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:name A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE ASG AT AN
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_parentId_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_parentId_attribute.html
index c9b37a78f..39b4b2394 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_parentId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_parentId_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_parentId_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:parentId A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE ARO AT ADV
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_path_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_path_attribute.html
index 0f575e4f8..a34350406 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_path_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_path_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_path_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:path A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE ARO AT
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_serviceId_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_serviceId_attribute.html
index 51b183eaa..09010df14 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_serviceId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_serviceId_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_serviceId_attribute</title>
 <meta charset="utf-8"/>
@@ -74,6 +74,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", getMessageServicesSuccess, getMessageServicesError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_synchronizable_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_synchronizable_attribute.html
index 3ce1db1b3..406ef4143 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_synchronizable_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_synchronizable_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_synchronizable_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:synchronizable A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE AT ASG AN
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_type_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_type_attribute.html
index cf475660b..28e5bc8ce 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_type_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_email_type_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_email_type_attribute</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:type A
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE AT ARO
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_id_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_id_exist.html
index e11796ef6..2171b4acb 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_id_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_id_exist.html
@@ -48,7 +48,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:id A
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html 
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE
 setup({timeout: 180000});
 
@@ -79,6 +79,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", getMessageServicesSuccess, getMessageServicesError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_notexist.html
index 1766e1493..f4e9af33e 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFolder_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_path_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_path_exist.html
index e8c0a45c8..37739173c 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_path_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_path_exist.html
@@ -48,7 +48,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:path A
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html 
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE
 setup({timeout: 180000});
 
@@ -79,6 +79,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", getMessageServicesSuccess, getMessageServicesError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFolder_type_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageFolder_type_exist.html
index 2f3da3bad..7af663fe5 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFolder_type_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFolder_type_exist.html
@@ -48,7 +48,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageFolder:type A
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html 
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA AE
 setup({timeout: 180000});
 
@@ -79,6 +79,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", getMessageServicesSuccess, getMessageServicesError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageFoldersChangeCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageFoldersChangeCallback_notexist.html
index aca8064b7..10915717e 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageFoldersChangeCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageFoldersChangeCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageFoldersChangeCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_messaging.html b/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_messaging.html
index 8c2331162..1033d05f1 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_messaging.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_messaging.html
@@ -34,7 +34,7 @@ Authors:
 
 <html>
 <head>
-<title>check tizen.messaging exists</title>
+<title>MessageManagerObject_messaging</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -54,4 +54,4 @@ test(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_notexist.html
index 622dafc45..05442af91 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageManagerObject_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageManagerObject_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_email_onsuccess.html
index 55666fe6a..e5d7ff3c2 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_email_onsuccess.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageRecipientsCallback_email_onsuccess</title>
 <meta charset="utf-8"/>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageRecipientsCallback_email_onsuccess
 //==== LABEL Check if callback is called and if its arguments have proper type, check argument recipients type - DOMString[]
 //==== SPEC Tizen Web API:Communication:Messaging:MessageRecipientsCallback:onsuccess M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
@@ -71,4 +71,3 @@ t.step(function () {
 </script>
 </body>
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_notexist.html
index 7cbe45e72..65c950d93 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageRecipientsCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageRecipientsCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_email_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_email_onsuccess.html
index b39c78164..d743b990c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_email_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_email_onsuccess.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageServiceArraySuccessCallback_email_onsuccess</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageServiceArraySuccessCallback:onsuccess M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CBOA CBT
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_notexist.html
index da40993dc..c43cbf6c6 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageServiceArraySuccessCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_onsuccess.html b/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_onsuccess.html
index e8b499092..5e3f9bd4b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_onsuccess.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageServiceArraySuccessCallback_onsuccess.html
@@ -67,6 +67,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_extend.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_extend.html
index a7f271d3c..0813a552f 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_extend.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
 
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_extend</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:MessageService U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 setup({timeout: 180000});
 
@@ -59,6 +59,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_id_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_id_attribute.html
index a1df4951c..22d34a4dd 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_id_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_id_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com
+        Andrzej Krolikowski <a.krolikowsk@samsung.com
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_id_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
index 1b13b39ac..3113eab4e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment</title>
 <script src="../resources/unitcommon.js"></script>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageService_email_loadMessageAttachment
 //==== LABEL Check MessageService.loadMessageAttachment method with optional arguments (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MOA MAST
@@ -40,7 +40,7 @@ setup({timeout: 180000});
 
 var t = async_test("MessageService_email_loadMessageAttachment", {timeout:180000}),
     service, inboxFolder, message, attachment, returnedValue,
-    serviceSuccess, serviceError, sendSuccess, sendError, syncSuccess, syncError, 
+    serviceSuccess, serviceError, sendSuccess, sendError, syncSuccess, syncError,
     findSuccess, findError, foundMessage, loadAttachmentSuccess, loadAttachmentError,
     loadBodySuccess, loadBodyError, loadMessage, folderSuccess, folderError;
 
@@ -133,6 +133,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_TypeMismatch.html
index 91dc6efd3..4d2a74c99 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_attachment_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument attachment conversions exception - loadMessageAttachment, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -88,6 +88,7 @@ t.step(function () {
     });
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_invalid_cb.html
index d1c75e17e..5ed0c5ad0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_attachment_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_attachment_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument attachment validation - loadMessageAttachment, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTO
@@ -91,6 +91,7 @@ t.step(function () {
     });
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_TypeMismatch.html
index c266c098a..75bba9d94 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_errorCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument errorCallback conversions exception - loadMessageAttachment, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -84,6 +84,7 @@ t.step(function () {
     });
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_invalid_cb.html
index 08ef76cc2..204486dc3 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_errorCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_errorCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument errorCallback validation - loadMessageAttachment, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -85,6 +85,7 @@ t.step(function () {
     });
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_exist.html
index 5af444b63..f0a08a295 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_exist.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_exist</title>
 <script src="../resources/unitcommon.js"></script>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -61,6 +61,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_missarg.html
index abc932471..db3c44ac0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_missarg</title>
 <script src="../resources/unitcommon.js"></script>
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageService_email_loadMessageAttachment_missarg
 //==== LABEL Check with missing non-optional arguments loadMessageAttachment - email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
@@ -70,6 +70,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_TypeMismatch.html
index b10487c24..95918ccda 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument successCallback conversions exception - loadMessageAttachment, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -86,6 +86,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_invalid_cb.html
index 785b0dd3a..c6d5e1e66 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_successCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_successCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument successCallback validation - loadMessageAttachment, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -85,6 +85,7 @@ t.step(function () {
     });
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html
index 32bd76ac3..b5370ba51 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageAttachment_without_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageAttachment_without_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageService_email_loadMessageAttachment_without_errorCallback
 //==== LABEL Check MessageService.loadMessageAttachment method with non-optional arguments (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageAttachment M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MMINA MAST
@@ -127,8 +127,9 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody.html
index abf15912f..f7efd7e3b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody.html
@@ -48,7 +48,7 @@ Authors:
 //==== TEST: MessageService_email_loadMessageBody
 //==== LABEL Check if method loadMessageBody of MessageService (email) works with only non-optional arguments
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR MAST
@@ -143,6 +143,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_TypeMismatch.html
index 5d6d59740..0fbe84b9e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_TypeMismatch.html
@@ -49,7 +49,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
@@ -98,6 +98,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_invalid_cb.html
index 5e68b6289..b5dd8a9a1 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_errorCallback_invalid_cb.html
@@ -47,7 +47,7 @@ Authors:
 //==== LABEL Check if method loadMessageBody (email) throws exception with invalid errorCallback
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -95,6 +95,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_exist.html
index aa01d685c..1f339e7c1 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_exist.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageBody_exist</title>
 <script src="../resources/unitcommon.js"></script>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -56,6 +56,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg.html
index 395b9ca16..b73a3c1b0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageBody_missarg</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageService_email_loadMessageBody_missarg
 //==== LABEL Check with missing non-optional argument - loadMessageBody, email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
@@ -56,7 +56,7 @@ t.step(function () {
     addDraftError = t.step_func(function (msg) {
         assert_unreached("addDraftMessage error callback called: " + error.name + " with message: " + error.message);
     });
-  
+
     serviceSuccess = t.step_func(function (emailService) {
         service = emailService;
 
@@ -71,6 +71,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg_message.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg_message.html
index 7b768ea7e..be6f905c9 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg_message.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_missarg_message.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
-    Karol Surma <k.surma@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
+        Karol Surma <k.surma@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_loadMessageBody_missarg_message</title>
 <script src="../resources/unitcommon.js"></script>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMA
 setup({timeout: 180000});
 
@@ -61,6 +61,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_TypeMismatch.html
index 71cf8d1a0..76e310ca6 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_TypeMismatch.html
@@ -49,7 +49,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
@@ -61,7 +61,7 @@ var t = async_test("MessageService_email_loadMessageBody_successCallback_TypeMis
 t.step(function () {
     findMessagesSuccess = t.step_func(function (messages) {
         assert_draft_message_equals(t, messages, message);
-        
+
         conversionTable = getTypeConversionExceptions("functionObject", false);
 
         for(i = 0; i < conversionTable.length; i++) {
@@ -88,7 +88,7 @@ t.step(function () {
     addDraftError = t.step_func(function (msg) {
         assert_unreached("addDraftMessage error callback called: " + error.name + " with message: " + error.message);
     });
-  
+
     serviceSuccess = t.step_func(function (emailService) {
         service = emailService;
 
@@ -103,6 +103,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_invalid_cb.html
index 96e18f7d4..b5b0e01ec 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_successCallback_invalid_cb.html
@@ -47,7 +47,7 @@ Authors:
 //==== LABEL Check method loadMessageBodys successCallback invalid callback (email)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -69,7 +69,7 @@ t.step(function () {
     addDraftError = t.step_func(function (msg) {
         assert_unreached("addDraftMessage error callback called: " + error.name + " with message: " + error.message);
     });
-  
+
     serviceSuccess = t.step_func(function (emailService) {
         service = emailService;
 
@@ -84,6 +84,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_with_errorCallback.html
index d81847cf7..1c3c79937 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_loadMessageBody_with_errorCallback.html
@@ -46,7 +46,7 @@ Authors:
 //==== TEST: MessageService_email_loadMessageBody_with_errorCallback
 //==== LABEL Check if method loadMessageBody of MessageService (email) works with all proper all arguments
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:loadMessageBody M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA MR MAST
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -145,6 +145,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_messageStorage_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_messageStorage_attribute.html
index 161deeb95..bb73e1405 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_messageStorage_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_messageStorage_attribute.html
@@ -16,13 +16,13 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageService_messageStorage_attribute</title>
+<title>MessageService_email_messageStorage_attribute</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_name_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_name_attribute.html
index 8b98443d9..8e8422a95 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_name_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_name_attribute.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com
+        Andrzej Krolikowski <a.krolikowsk@samsung.com
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_name_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html
index 46b136f89..eebf242b6 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage.html
@@ -34,7 +34,7 @@ Authors:
 
 -->
 
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
@@ -48,7 +48,7 @@ Authors:
 //==== TEST: MessageService_email_sendMessage
 //==== LABEL Proper invocation with arguments - check if sendMessage (email) does what it should.
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MAST MOA MR
@@ -157,6 +157,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_TypeMismatch.html
index e90cda4a3..a4df10fa0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_TypeMismatch.html
@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_errorCallback_TypeMismatch</title>
 <script src="../resources/unitcommon.js"></script>
@@ -32,7 +32,7 @@ Authors:
 //==== LABEL Check argument errorCallback (email) conversions exception
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -76,6 +76,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_invalid_cb.html
index b9d799ecc..b817d6ae1 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_invalid_cb.html
@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_errorCallback_invalid_cb</title>
 <script src="../resources/unitcommon.js"></script>
@@ -29,10 +29,10 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageService_email_sendMessage_errorCallback_invalid_cb
-//==== LABEL Check argument MessageService.sendMessage (email) errorCallback validation - use {onsuccess: function(){}}
+//==== LABEL Check argument MessageService.sendMessage (email) errorCallback validation - use {onsuccess: function (){}}
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -74,8 +74,9 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_exist.html
index 9ee8a9139..0288e087f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_exist.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_exist</title>
 <script src="../resources/unitcommon.js"></script>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -57,6 +57,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_TypeMismatch.html
index 5af78c4c5..445eebe7b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_message_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check message (email) argument conversions exception
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -83,4 +83,3 @@ t.step(function () {
 </script>
 </body>
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_invalid_obj.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_invalid_obj.html
index 8dcb1924e..0f1b796e0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_invalid_obj.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_message_invalid_obj.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_message_invalid_obj</title>
 <script src="../resources/unitcommon.js"></script>
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL Check MessageService.sendMessage (email) argument message validation - use simple object
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTO
@@ -97,6 +97,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_missarg.html
index a70de0fd7..3a904ab27 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_missarg</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageService_email_sendMessage_missarg
 //==== LABEL Check MessageService.sendMessage (email) with missing non-optional argument
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
@@ -66,4 +66,3 @@ t.step(function () {
 </script>
 </body>
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_TypeMismatch.html
index a3f90bbc0..c82e858b0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument successCallback (email) conversions exception
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_invalid_cb.html
index 6e850c8fd..0564cbc3a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_successCallback_invalid_cb</title>
 <script src="../resources/unitcommon.js"></script>
@@ -30,10 +30,10 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageService_email_sendMessage_successCallback_invalid_cb
-//==== LABEL Check argument MessageService.sendMessage (email) successCallback validation - use {onsuccess: function(){}}
+//==== LABEL Check argument MessageService.sendMessage (email) successCallback validation - use {onsuccess: function (){}}
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -75,6 +75,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_errorCallback.html
index 427541973..32883acd4 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_without_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageService_email_sendMessage_without_errorCallback
 //==== LABEL Check without optional argument sendMessage(valid_message, valid_successCallback) (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MOA
@@ -68,4 +68,3 @@ t.step(function () {
 </script>
 </body>
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_successCallback.html
index de88e5f68..8a15a5868 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_without_successCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sendMessage_without_successCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageService_email_sendMessage_without_successCallback
 //==== LABEL Check without optional argument sendMessage(valid_message) (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MMINA
@@ -61,4 +61,3 @@ t.step(function () {
 </script>
 </body>
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_stopSync_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_stopSync_exist.html
index e17beffc3..af56c4034 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_stopSync_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_stopSync_exist.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_stopSync_exist</title>
 <script src="../resources/unitcommon.js"></script>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:stopSync M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -57,6 +57,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_syncFolder_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_syncFolder_exist.html
index 84d824f2d..2bf3bc07f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_syncFolder_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_syncFolder_exist.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_syncFolder_exist</title>
 <script src="../resources/unitcommon.js"></script>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -57,6 +57,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sync_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sync_exist.html
index b98b5956d..b3c68e144 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_sync_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_sync_exist.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_email_sync_exist</title>
 <script src="../resources/unitcommon.js"></script>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -57,6 +57,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_email_type_attribute.html b/tct-messaging-email-tizen-tests/messaging/MessageService_email_type_attribute.html
index dbfd034ec..984a3d43c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_email_type_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_email_type_attribute.html
@@ -16,13 +16,13 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageService_type_attribute</title>
+<title>MessageService_email_type_attribute</title>
 <script src="../resources/unitcommon.js"></script>
 <script src="support/messaging_common.js"></script>
 </head>
@@ -56,6 +56,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageService_notexist.html
index cbeaa56cb..fbf0dedfd 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithBcc.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithBcc.html
index 3bdc0ac04..9a76ecb26 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithBcc.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithBcc.html
@@ -53,29 +53,30 @@ setup({timeout: 180000});
 var t = async_test("MessageService_sendMessage_emailWithBcc", {timeout: 180000}),
     message, messageSent, messageFailed, serviceSuccess, serviceError;
 
-t.step(function() {
+t.step(function () {
 
-    messageSent = t.step_func(function(recipients) {
+    messageSent = t.step_func(function (recipients) {
         assert_true(recipients.length > 0, "No message sent successfully");
         t.done();
     });
 
-    messageFailed = t.step_func(function(error) {
+    messageFailed = t.step_func(function (error) {
         assert_unreached("sendMessage() error: " + error.message);
     });
 
-    serviceSuccess = t.step_func(function(service) {
+    serviceSuccess = t.step_func(function (service) {
         message = createSimpleMessageTo(TEST_EMAIL_RECIPIENT_2);
         message.bcc = [TEST_EMAIL_RECIPIENT_1];
         sendMessage(t, service, message, messageSent, messageFailed);
     });
 
-    serviceError = t.step_func(function(err) {
+    serviceError = t.step_func(function (err) {
         assert_unreached("getEmailService() error: " + err.message);
     });
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithPriority.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithPriority.html
index 225093ab6..ee028ce09 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithPriority.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_emailWithPriority.html
@@ -51,32 +51,33 @@ Authors:
 //==== TEST_CRITERIA MOA
 setup({timeout: 180000});
 var t = async_test("MessageService_sendMessage_emailWithPriority", {timeout: 180000}),
-message, serviceSuccess, serviceError, sendSuccess, sendError
+message, serviceSuccess, serviceError, sendSuccess, sendError;
 
-t.step(function() {
+t.step(function () {
 
-    sendSuccess = t.step_func(function(recipients) {
+    sendSuccess = t.step_func(function (recipients) {
         assert_true(recipients.length > 0, "No message sent successfully");
         t.done();
     });
 
-    sendError = t.step_func(function(error) {
+    sendError = t.step_func(function (error) {
         assert_unreached("sendMessage() error: " + error.message);
     });
 
-    serviceSuccess = t.step_func(function(service) {
+    serviceSuccess = t.step_func(function (service) {
         message = createSimpleMessageTo(TEST_EMAIL_RECIPIENT_2);
         message.isHighPriority = true;
 
         sendMessage(t, service, message, sendSuccess, sendError);
     });
 
-    serviceError = t.step_func(function(err) {
+    serviceError = t.step_func(function (err) {
         assert_unreached("getMessageServices() error: " + err.message);
     });
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_email_without_callbacks.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_email_without_callbacks.html
index 7d162d07c..53ba5ad71 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_email_without_callbacks.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sendMessage_email_without_callbacks.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_sendMessage_email_without_callbacks</title>
 <meta charset="utf-8">
@@ -38,7 +38,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sendMessage M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#sendMessageid2463900
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMINA MR
 setup({timeout: 180000});
 
@@ -55,7 +55,7 @@ t.step(function () {
         return t.done();
     });
 
-    serviceError = t.step_func(function(err) {
+    serviceError = t.step_func(function (err) {
         assert_unreached("getMessageServices() error: " + err.message);
     });
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_sync.html b/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_sync.html
index 1b8112b36..b6cb74d2b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_sync.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_sync.html
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL: Check if stopSync method with non-optional argument works for sync method
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:stopSync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR MAST
@@ -72,6 +72,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_syncFolder.html b/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_syncFolder.html
index ba13ed0b5..34f8b43af 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_syncFolder.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_stopSync_syncFolder.html
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL: Check if stopSync method with non-optional argument works for syncFolder method
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:stopSync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR MAST
@@ -73,7 +73,7 @@ t.step(function () {
     });
 
     serviceSuccess = t.step_func(function (emailService) {
-        service = emailService
+        service = emailService;
 
         filterForServiceId = new tizen.AttributeFilter("serviceId", "EXACTLY", service.id);
 
@@ -86,6 +86,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync.html
index 1c43007a9..a77e3c6a5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMINA MR
 setup({timeout: 180000});
 
@@ -57,6 +57,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder.html
index 598b6eb0a..49aad5e49 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if syncFolder method with non-optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MR MMINA
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -71,6 +71,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_TypeMismatch.html
index 6aa81478e..2f6c312ca 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_TypeMismatch.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check argument errorCallback conversions exception for syncFolder method.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -81,6 +81,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_invalid_cb.html
index 1f97782ef..fd628a6ca 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_errorCallback_invalid_cb.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 setup({timeout: 180000});
 var t = async_test("MessageService_syncFolder_errorCallback_invalid_cb", {timeout: 180000}),
@@ -78,6 +78,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_folder_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_folder_TypeMismatch.html
index e3f642ef0..7d982667b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_folder_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_folder_TypeMismatch.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
@@ -64,6 +64,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_missarg.html
index a68854448..a89f992b6 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_missarg.html
@@ -32,7 +32,7 @@ Authors:
 //==== TEST: MessageService_syncFolder_missarg
 //==== LABEL: Check with missing non-optional argument in syncFolder method
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMA
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -55,6 +55,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_TypeMismatch.html
index d0d9b542e..62c351850 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_TypeMismatch.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check argument successCallback conversions exception for syncFolder method.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -46,9 +46,9 @@ var t = async_test("MessageService_syncFolder_successCallback_TypeMismatch", {ti
 t.step(function () {
     findSuccess = t.step_func(function (folders) {
         assert_true(folders.length > 0, "No folder found.");
-    
+
         conversionTable = getTypeConversionExceptions("functionObject", true);
-        
+
         for (i = 0; i < conversionTable.length; i++) {
             successCallback = conversionTable[i][0];
             exceptionName = conversionTable[i][1];
@@ -76,6 +76,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_invalid_cb.html
index 4ff4f8f7d..0ce61061a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_successCallback_invalid_cb.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 setup({timeout: 180000});
 var t = async_test("MessageService_syncFolder_successCallback_invalid_cb", {timeout: 180000}),
@@ -71,6 +71,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_errorCallback.html
index ac4ebd5fa..b6938d8a5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_errorCallback.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if syncFolder method with errorCallback optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR MAST
@@ -98,6 +98,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_limit.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_limit.html
index e887a4ace..27b74d15d 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_limit.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_limit.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if syncFolder method with limit optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR
@@ -61,13 +61,13 @@ t.step(function () {
         syncId = service.syncFolder(inboxFolder, syncFolderSuccess, syncFolderError, 10);
     });
 
-    findFoldersError = t.step_func(function(error) {
+    findFoldersError = t.step_func(function (error) {
         assert_unreached("findFolders() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
     serviceSuccess = t.step_func(function (emailService) {
         service = emailService;
-        
+
         findFolders(t, service, findFoldersSuccess, findFoldersError);
     });
 
@@ -77,6 +77,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_successCallback.html
index a288b91b4..19b4a3f6c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_syncFolder_with_successCallback.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:syncFolder M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA MR MAST
 setup({timeout: 180000});
 
@@ -93,6 +93,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_emailwithoutparam.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_emailwithoutparam.html
index b821df732..0d5a0223c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_emailwithoutparam.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_emailwithoutparam.html
@@ -73,6 +73,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_TypeMismatch.html
index ba6ca1c33..2738f4e5b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_TypeMismatch.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
@@ -67,6 +67,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_invalid_cb.html
index 2a6dc44f7..06f0873e8 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_errorCallback_invalid_cb.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 setup({timeout: 180000});
 
@@ -68,6 +68,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_foremail.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_foremail.html
index 358748d9b..2a7543dec 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_foremail.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_foremail.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageService_sync_foremail</title>
 <meta charset="utf-8">
@@ -38,7 +38,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#syncidp342960
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMINA
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_TypeMismatch.html
index 85f84d396..9cd8c523b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_TypeMismatch.html
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
@@ -64,6 +64,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_invalid_cb.html
index 2105eda1a..46917b898 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_successCallback_invalid_cb.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Test whether the constructor of the interface is defined or not in sync method successCallback callback.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -62,6 +62,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html
index ea9d4bc11..eeaa82a56 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_errorCallback.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if sync method with errorCallback optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR MAST
@@ -106,6 +106,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_limit.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_limit.html
index d37b6f07c..9fcd72efc 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_limit.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_limit.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if sync method with downloadId optional limit argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -60,6 +60,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
index 6f92a2683..28cff544d 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageService_sync_with_successCallback.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if sync method with successCallback optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageService:sync M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR MAST
@@ -41,7 +41,7 @@ setup({timeout: 180000});
 
 var t = async_test("MessageService_sync_with_successCallback", {timeout: 180000}),
     serviceSuccess, serviceError, service, message, returnedValue = null,
-    sendSuccess, sendError, syncSuccess, findFoldersSuccess, findFoldersError, 
+    sendSuccess, sendError, syncSuccess, findFoldersSuccess, findFoldersError,
     findMessageSuccess, findMessageError;
 
 t.step(function () {
@@ -96,6 +96,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener.html
index 65b630937..3e2e27075 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener.html
@@ -45,7 +45,7 @@ Authors:
 //==== LABEL: Check if addConversationsChangeListener method with non-optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MMINA MAST
@@ -97,6 +97,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_filter_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_filter_TypeMismatch.html
index bf30d12f5..1f7115026 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_filter_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_filter_TypeMismatch.html
@@ -32,7 +32,7 @@ Authors:
 //==== LABEL: Check argument filter conversions exception for addConversationsChangeListener method.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -79,7 +79,7 @@ t.step(function () {
             }, exceptionName + " should be thrown - given incorrect filter: " + filter);
         }
 
-        t.done();        
+        t.done();
     });
 
     serviceError = t.step_func(function (error) {
@@ -88,6 +88,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_missarg.html
index 8f6a30ccc..7fd20493b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_missarg.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if addConversationsChangeListener of MessageStorage with missing non-optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
@@ -41,7 +41,7 @@ Authors:
 setup({timeout: 180000});
 var t = async_test("MessageStorage_addConversationsChangeListener_missarg", {timeout: 180000}),
     serviceSuccess, serviceError, service, watchId;
-t.step(function() {
+t.step(function () {
     add_result_callback(function () {
         try {
             service.messageStorage.removeChangeListener(watchId);
@@ -50,12 +50,12 @@ t.step(function() {
         }
     });
 
-    serviceSuccess = t.step_func(function(emailService) {
+    serviceSuccess = t.step_func(function (emailService) {
         service = emailService;
 
         assert_throws({
             name: "TypeMismatchError"
-        }, function() {
+        }, function () {
             watchId = service.messageStorage.addConversationsChangeListener();
         });
 
@@ -68,6 +68,7 @@ t.step(function() {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_with_filter.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_with_filter.html
index 7cd5cfcfd..99a1213df 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_with_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_with_filter.html
@@ -32,7 +32,7 @@ Authors:
 //==== LABEL: Check if addConversationsChangeListener method with optional filter argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MAST
@@ -84,6 +84,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutcb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutcb.html
index 3695c85c6..fe281fe36 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutcb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_addConversationsChangeListener_withoutcb.html
@@ -47,18 +47,18 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMA
 setup({timeout: 180000});
 
 var t = async_test("MessageStorage_addConversationsChangeListener_withoutcb", {timeout: 180000}),
     serviceSuccess, serviceError;
 
-t.step(function() {
+t.step(function () {
     serviceSuccess = t.step_func(function (service) {
         assert_throws({
             name: "TypeMismatchError"
-        }, function() {
+        }, function () {
             service.messageStorage.addConversationsChangeListener();
         }, "TypeMismatchError exception expected but not thrown.");
 
@@ -71,6 +71,7 @@ t.step(function() {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_conversationsChangeCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_conversationsChangeCallback_invalid_cb.html
index 5ff79b3f3..549acef0e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_conversationsChangeCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_conversationsChangeCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addConversationsChangeListener_conversationsChangeCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument conversationsChangeCallback validation - addConversationsChangeListener, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTL
@@ -55,7 +55,7 @@ t.step(function () {
                     service.messageStorage.addConversationsChangeListener(incorrectChangeListener);
                 }, exceptionName + " should be thrown - given incorrect listener.");
         }
-        t.done();      
+        t.done();
     });
 
     serviceError = t.step_func(function (error) {
@@ -64,6 +64,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_exist.html
index 0facdb58b..13045937d 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addConversationsChangeListener_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addConversationsChangeListener_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addConversationsChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage.html
index b23d51d5b..5003ae80d 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addDraftMessage
 //==== LABEL Check if method addDraftMessage of MessageStorage (email) works properly.
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MAST MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_TypeMismatch.html
index 1c205d85f..be76dd4fa 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_errorCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check if addDraftMessage (email) throws exception when errorCallback is incorrect
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -72,6 +72,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_invalid_cb.html
index e3965c249..98e3084e6 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_errorCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_errorCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check if addDraftMessage (email) throws exception when errorCallback is invalid
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_exist.html
index 1b1a266e2..a1a6a9a5a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_TypeMismatch.html
index 1f6eb5017..ffddaae40 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_message_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument message conversions exception in addDraftMessage method (email)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_invalid_obj.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_invalid_obj.html
index 12027124a..48e260bf0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_invalid_obj.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_message_invalid_obj.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_message_invalid_obj</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument message validation in addDraftMessage method (email) - invalid object
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTO
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_missarg.html
index 9c42381f4..a28364451 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_missarg</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addDraftMessage_missarg
 //==== LABEL Check MessageStorage.addDraftMessage (email) with missing non-optional argument
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_TypeMismatch.html
index 9ee18b368..f4e010206 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check if addDraftMessage (email) throws exception when successCallback is incorrect
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_invalid_cb.html
index 5e089c348..7182ec261 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_successCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_successCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check if addDraftMessage (email) throws exception when successCallback is invalid
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -71,7 +71,6 @@ t.step(function () {
     getEmailService(t, serviceSuccess, serviceError);
 });
 
-
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_errorCallback.html
index 9e21dd196..3c5f25db4 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_without_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addDraftMessage_without_errorCallback
 //==== LABEL Check if method addDraftMessage of MessageStorage (email) works properly without errorCallback
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MOA MAST
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_successCallback.html
index ae448d539..c92285747 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addDraftMessage_without_successCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addDraftMessage_without_successCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addDraftMessage_without_successCallback
 //==== LABEL Check if method addDraftMessage of MessageStorage (email) works properly without successCallback
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addDraftMessage M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MMINA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener.html
index 8891f096b..30add7432 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addFoldersChangeListener</title>
 <meta charset="utf-8">
@@ -38,7 +38,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMINA MR
 setup({timeout: 180000});
 
@@ -48,11 +48,11 @@ var t = async_test("MessageStorage_email_addFoldersChangeListener", {timeout: 18
 t.step(function () {
 
     foldersChangeCallback = {
-        foldersupdated : t.step_func(function(updatedFolders){
+        foldersupdated : t.step_func(function (updatedFolders){
         }),
-        foldersadded : t.step_func(function(addedFolders){
+        foldersadded : t.step_func(function (addedFolders){
         }),
-        foldersremoved : t.step_func(function(removedFolders){
+        foldersremoved : t.step_func(function (removedFolders){
         })
     };
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_exist.html
index e19ae4e9b..97b4ab8a5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addFoldersChangeListener_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_filter_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_filter_TypeMismatch.html
index 5c8f2f8d7..4caa5452a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_filter_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_filter_TypeMismatch.html
@@ -47,7 +47,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 
 setup({timeout: 180000});
@@ -58,13 +58,13 @@ var t = async_test("MessageStorage_email_addFoldersChangeListener_filter_TypeMis
 t.step(function () {
 
     foldersChangeCallback = {
-        foldersupdated : t.step_func(function(updatedFolders){
+        foldersupdated : t.step_func(function (updatedFolders){
 
         }),
-        foldersadded : t.step_func(function(addedFolders){
+        foldersadded : t.step_func(function (addedFolders){
 
         }),
-        foldersremoved : t.step_func(function(removedFolders){
+        foldersremoved : t.step_func(function (removedFolders){
 
         })
     };
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_foldersChangeCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_foldersChangeCallback_TypeMismatch.html
index 6c5c09522..e32109bd2 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_foldersChangeCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_foldersChangeCallback_TypeMismatch.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 
 Authors:
-    Karol Surma <k.surma@samsung.com>
+        Karol Surma <k.surma@samsung.com>
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addFoldersChangeListener_foldersChangeCallback_TypeMismatch</title>
 <meta charset="utf-8">
@@ -38,16 +38,16 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
 var t = async_test("MessageStorage_email_addFoldersChangeListener_foldersChangeCallback_TypeMismatch", {timeout: 180000}),
-    serviceSuccess, serviceError, 
+    serviceSuccess, serviceError,
     incorrectCallback, conversionTable, i, exceptionName;
 
 t.step(function () {
-    serviceSuccess = t.step_func(function (service) {       
+    serviceSuccess = t.step_func(function (service) {
         conversionTable = getTypeConversionExceptions("object", false);
 
         for(i = 0; i < conversionTable.length; i++) {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_invalid_cb.html
index 28a9db4bb..fe4bacf69 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_invalid_cb.html
@@ -47,7 +47,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTL
 setup({timeout: 180000});
 
@@ -79,6 +79,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_missarg.html
index 64e94f996..9ae1bd805 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_missarg.html
@@ -46,14 +46,14 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMA
 setup({timeout: 180000});
 
 var t = async_test("MessageStorage_email_addFoldersChangeListener_missarg", {timeout: 180000}),
     serviceSuccess, serviceError;
 
-t.step(function() {
+t.step(function () {
     serviceSuccess = t.step_func(function (service) {
         assert_throws({name: TYPE_MISMATCH_ERR },
             function () {
@@ -70,6 +70,7 @@ t.step(function() {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_with_filter.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_with_filter.html
index 3ab941bdd..e97a89612 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_with_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addFoldersChangeListener_with_filter.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 
 Authors:
-    Karol Surma <k.surma@samsung.com>
+        Karol Surma <k.surma@samsung.com>
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addFoldersChangeListener_with_filter</title>
 <meta charset="utf-8">
@@ -38,7 +38,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addFoldersChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA MR
 setup({timeout: 180000});
 
@@ -47,11 +47,11 @@ var t = async_test("MessageStorage_email_addFoldersChangeListener_with_filter",
 t.step(function () {
 
     foldersChangeCallback = {
-        foldersupdated : t.step_func(function(updatedFolders){
+        foldersupdated : t.step_func(function (updatedFolders){
         }),
-        foldersadded : t.step_func(function(addedFolders){
+        foldersadded : t.step_func(function (addedFolders){
         }),
-        foldersremoved : t.step_func(function(removedFolders){
+        foldersremoved : t.step_func(function (removedFolders){
         })
     };
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_exist.html
index e51b12707..2838d5845 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_filter_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_filter_TypeMismatch.html
index fdcc757de..f1bf29d58 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_filter_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_filter_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_filter_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument filter conversions exception - addMessagesChangeListener, filter, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -78,6 +78,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_TypeMismatch.html
index 04ce38581..fe2cd5595 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument messagesChangeCallback conversions exception - addMessagesChangeListener, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -63,6 +63,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_invalid_cb.html
index 0b0acd8dc..d469fb760 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_messagesChangeCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument messagesChangeCallback validation - invalid, email
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTL
@@ -64,6 +64,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_missarg.html
index f41a3f835..625fd389c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_missarg</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addMessagesChangeListener_missarg
 //==== LABEL Check with missing non-optional argument - addMessagesChangeListener, email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
@@ -57,6 +57,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_with_filter.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_with_filter.html
index 591e976b7..8fa4598ca 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_with_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_with_filter.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_with_filter</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addMessagesChangeListener_with_filter
 //==== LABEL Check with optional arguments addMessagesChangeListener (email)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MOA MAST
@@ -94,6 +94,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_without_filter.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_without_filter.html
index a49e4ffd6..ca39abc35 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_without_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_addMessagesChangeListener_without_filter.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_addMessagesChangeListener_without_filter</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_addMessagesChangeListener_without_filter
 //==== LABEL Check if method addMessagesChangeListener of MessageStorage (email) works properly without filter.
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:addMessagesChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MMINA MAST
@@ -95,6 +95,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_extend.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_extend.html
index 0d57f280c..daee7d10f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_extend.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_extend</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:MessageStorage U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_exist.html
index 4a17ca2f7..ab5ef72f8 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findConversations_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html
index 48e156f29..a38abf13e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_from.html
@@ -45,7 +45,7 @@ Authors:
 //==== TEST: MessageStorage_email_findConversations_filter_from
 //==== LABEL Check if method findConversations of MessageStorage (email) filter from
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
@@ -98,8 +98,9 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_to.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_to.html
index 226f3f190..92c7af38a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_to.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_to.html
@@ -44,7 +44,7 @@ Authors:
 //==== TEST: MessageStorage_email_findConversations_filter_to
 //==== LABEL Check if method findConversations of MessageStorage (email) filter to
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -54,7 +54,7 @@ var t = async_test("MessageStorage_email_findConversations_filter_to",{ timeout:
     serviceSuccess, serviceError, service, message,
     addDraftSuccess, addDraftError, filter, findSuccess, findError;
 
-t.step(function() {
+t.step(function () {
     findSuccess = t.step_func(function (conversations) {
         assert_greater_than(conversations.length, 0, "Received empty conversations array");
 
@@ -91,7 +91,7 @@ t.step(function() {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
 
 </script>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_type.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_type.html
index f00532831..92a477c80 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_type.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_filter_type.html
@@ -34,7 +34,7 @@ Authors:
 
 <html>
 <head>
-<title>Check findConversations method with find conversations of type</title>
+<title>MessageStorage_email_findConversations_filter_type</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -44,7 +44,7 @@ Authors:
 //==== TEST: MessageStorage_email_findConversations_filter_type
 //==== LABEL Check if method findConversations of MessageStorage (email) filter type
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -89,6 +89,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort.html
index 99caf1495..9a8a8435b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort.html
@@ -35,7 +35,7 @@ Authors:
 
 <html>
 <head>
-<title>check findConversations email with email parameter by time ASC</title>
+<title>MessageStorage_email_findConversations_with_sort</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -45,7 +45,7 @@ Authors:
 //==== TEST: MessageStorage_email_findConversations_with_sort
 //==== LABEL Check if method findConversations of MessageStorage (email) with sort
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -96,6 +96,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort_time_desc.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort_time_desc.html
index 5f908503b..e6f76f10a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort_time_desc.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_with_sort_time_desc.html
@@ -47,7 +47,7 @@ Authors:
 //==== TEST: MessageStorage_email_findConversations_with_sort_time_desc
 //==== LABEL Check if method findConversations of MessageStorage (email) with sort time desc
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_without_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_without_errorCallback.html
index e6258d411..d6be2b880 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_without_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findConversations_without_errorCallback.html
@@ -46,7 +46,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMINA
 setup({timeout: 180000});
 
@@ -57,7 +57,7 @@ t.step(function () {
     findConversationsSuccess = t.step_func(function (conversations) {
         assert_type(conversations, "array", "Not an array");
         assert_greater_than(conversations.length, 0, "Received empty messages array");
-       
+
         for (var i in conversations) {
             assert_equals(conversations[i].type, service.type, "Incorrect service type");
         }
@@ -85,6 +85,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findFolders_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findFolders_exist.html
index 0de687dff..78fbce475 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findFolders_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findFolders_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findFolders_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html
index c45189fea..490208970 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages
 //==== LABEL Check MessageStorage.findMessages method with non-optional arguments (filter by Message.id) for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_and_loadMessageBody.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_and_loadMessageBody.html
index aa1b6d530..f01d1fef0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_and_loadMessageBody.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_and_loadMessageBody.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_and_loadMessageBody</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_and_loadMessageBody
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback) id for email, load and check message body
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA
@@ -128,7 +128,7 @@ t.step(function () {
             plainBody: MESSAGE_BODY_PLAIN,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority: false
-        }); 
+        });
 
         message.attachments = [
             new tizen.MessageAttachment(MESSAGE_ATTACHMENT_IMAGE_PATH, MESSAGE_ATTACHMENT_IMAGE_MIME_TYPE)
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_bcc_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_bcc_with_errorCallback.html
index aa9c32f39..4cd8b3d9e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_bcc_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_bcc_with_errorCallback.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
 
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_bcc_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_bcc_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) bcc for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_cc_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_cc_with_errorCallback.html
index 89e6f8f12..3bc0079bf 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_cc_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_cc_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_cc_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_cc_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) cc for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -90,6 +90,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_exist.html
index 602c04d80..00f168d7a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_folderId_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_folderId_with_errorCallback.html
index 48f51067a..8cd3c35b7 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_folderId_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_folderId_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_folderId_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
index 5095c664f..a1b56b539 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_from_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_from_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_from_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) from for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_hasAttachment_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_hasAttachment_with_errorCallback.html
index f1a5607eb..bb8a3005d 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_hasAttachment_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_hasAttachment_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_hasAttachment_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_hasAttachment_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) hasAttachment for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_id_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_id_with_errorCallback.html
index 1c1998d46..8babd6d14 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_id_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_id_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_id_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_id_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) id for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -76,6 +76,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isHighPriority_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isHighPriority_with_errorCallback.html
index d88bb8f53..adcee49e4 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isHighPriority_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isHighPriority_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_isHighPriority_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA
 setup({timeout: 180000});
 
@@ -89,6 +89,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html
index ba95d402b..181905bef 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_isRead_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_isRead_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA
 setup({timeout: 180000});
 
@@ -132,6 +132,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_plainBody_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_plainBody_with_errorCallback.html
index 118a17a9f..4a3f89e91 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_plainBody_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_plainBody_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_plainBody_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_plainBody_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) plainBody for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -86,7 +86,7 @@ t.step(function () {
         service = emailService;
 
         message = createSimpleMessageTo(TEST_EMAIL_RECIPIENT_2);
-        
+
         service.messageStorage.addDraftMessage(message, addDraftSuccess, addDraftError);
     });
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_serviceId_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_serviceId_with_errorCallback.html
index ce243771f..de82119d8 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_serviceId_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_serviceId_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_serviceId_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_serviceId_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) serviceId for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -50,7 +50,7 @@ t.step(function () {
 
         for (var i in messages) {
             assert_true(messages[i] instanceof tizen.Message, "Not a Message");
-            assert_equals(messages[i].type, service.type, "Invalid service type");            
+            assert_equals(messages[i].type, service.type, "Invalid service type");
 
             if (messages[i].id === message.id) {
                 messageFound = true;
@@ -88,6 +88,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_timestamp_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_timestamp_with_errorCallback.html
index 9ff701ccd..149be0373 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_timestamp_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_timestamp_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_timestamp_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_timestamp_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) timestamp for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_to_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_to_with_errorCallback.html
index 045c7c0b9..24d390f8a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_to_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_to_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_to_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_to_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) to for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_type_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_type_with_errorCallback.html
index daecdf71e..c4f1f9a4c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_type_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_findMessages_type_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_findMessages_type_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_findMessages_type_with_errorCallback
 //==== LABEL Check with optional arguments findMessages(valid_filter, valid_successCallback, valid_errorCallback) type for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeChangeListener_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeChangeListener_exist.html
index d4543ec3c..f1d05650b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeChangeListener_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeChangeListener_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_removeChangeListener_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeChangeListener M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -56,6 +56,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeConversations_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeConversations_exist.html
index 60c18af93..d59cffb69 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeConversations_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeConversations_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_removeConversations_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -56,6 +56,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeMessages_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeMessages_exist.html
index d7d0c601b..fd89a5476 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeMessages_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_removeMessages_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_removeMessages_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
@@ -56,6 +56,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages.html
index 5d68a5975..e95c9e178 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_updateMessages
 //==== LABEL Check if method updateMessages of MessageStorage (email) works properly.
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MOA MAST
@@ -233,7 +233,7 @@ t.step(function () {
             plainBody: plainBodyToSetForMutableMesage,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority : false
-        }); 
+        });
 
         service.messageStorage.addDraftMessage(mutableMessage, addDraftSuccess, addDraftError);
 
@@ -244,7 +244,7 @@ t.step(function () {
             plainBody: plainBodyToSetForConstMessage,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority : false
-        }); 
+        });
 
         constMessage.attachments = [
             new tizen.MessageAttachment(MESSAGE_ATTACHMENT_SOUND_PATH, MESSAGE_ATTACHMENT_SOUND_MIME_TYPE),
@@ -260,6 +260,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_TypeMismatch.html
index 801ba30bc..0e551e4ec 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_errorCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument errorCallback conversions exception - updateMessages (email)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -84,6 +84,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_invalid_cb.html
index 2e31537ea..314f4fbfb 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_errorCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_errorCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument errorCallback validation - updateMessages (email)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -83,6 +83,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_exist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_exist.html
index 8ec69fdbb..42aebba75 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_exist</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_messages_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_messages_TypeMismatch.html
index f1e0ddff4..d0072d425 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_messages_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_messages_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_messages_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument messages conversions exception - updateMessages (EMAIL)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -74,6 +74,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_missarg.html
index 6dd81d17b..b31b6728a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_missarg</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_updateMessages_missarg
 //==== LABEL Check with missing non-optional argument - updateMessages (EMAIL)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_TypeMismatch.html
index f4db2cb70..f62317375 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument successCallback conversions exception - updateMessages (email)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_invalid_cb.html
index 7f585d590..4cec91d96 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_successCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_successCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument successCallback validation - updateMessages (email)
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -83,6 +83,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_errorCallback.html
index 2c26ab307..850f83ccf 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_without_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_updateMessages_without_errorCallback
 //==== LABEL Check if method updateMessages of MessageStorage (email) works properly - without errorCallback
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MOA MAST
@@ -41,7 +41,7 @@ setup({timeout: 180000});
 
 var t = async_test("MessageStorage_email_updateMessages_without_errorCallback", {timeout:180000});
 t.step(function () {
-    var serviceSuccess, serviceError, service, 
+    var serviceSuccess, serviceError, service,
         mutableMessage, constMessage,
         plainBodyToSetForMutableMesage = MESSAGE_BODY_PLAIN + "_mutable",
         plainBodyToSetForConstMessage = MESSAGE_BODY_PLAIN + "_const",
@@ -239,7 +239,7 @@ t.step(function () {
             plainBody: plainBodyToSetForMutableMesage,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority : false
-        }); 
+        });
 
         service.messageStorage.addDraftMessage(mutableMessage, addDraftSuccess, addDraftError);
 
@@ -249,7 +249,7 @@ t.step(function () {
             plainBody: plainBodyToSetForConstMessage,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority : false
-        }); 
+        });
 
         constMessage.attachments = [
             new tizen.MessageAttachment(MESSAGE_ATTACHMENT_SOUND_PATH, MESSAGE_ATTACHMENT_SOUND_MIME_TYPE),
@@ -266,7 +266,6 @@ t.step(function () {
     getEmailService(t, serviceSuccess, serviceError);
 });
 
-
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_successCallback.html
index ef0bfcf34..fdc42b538 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_email_updateMessages_without_successCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_email_updateMessages_without_successCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_email_updateMessages_without_successCallback
 //==== LABEL Check if method updateMessages of MessageStorage (email) works properly - without successCallback
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:updateMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MR MMINA
@@ -85,7 +85,7 @@ t.step(function () {
             plainBody: plainBodyToSetForMutableMesage,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority : false
-        }); 
+        });
 
         service.messageStorage.addDraftMessage(mutableMessage, addDraftSuccess, addDraftError);
 
@@ -95,7 +95,7 @@ t.step(function () {
             plainBody: plainBodyToSetForConstMessage,
             htmlBody: MESSAGE_BODY_HTML,
             isHighPriority : false
-        }); 
+        });
 
         constMessage.attachments = [
             new tizen.MessageAttachment(MESSAGE_ATTACHMENT_SOUND_PATH, MESSAGE_ATTACHMENT_SOUND_MIME_TYPE),
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders.html
index 2526a50fe..200d21302 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if function executes properly when all mandatory arguments given
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_TypeMismatch.html
index 41fcca786..52fb35dc5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_errorCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if exception is thrown when incorrect error callback given
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -45,7 +45,7 @@ var t = async_test("MessageStorage_findFolders_errorCallback_TypeMismatch", {tim
     exceptionName, conversionTable, filter;
 
 t.step(function () {
-    foldersSuccess = t.step_func(function() {
+    foldersSuccess = t.step_func(function () {
         assert_unreached("findFolders success callback should not be called.");
     });
 
@@ -76,8 +76,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
-
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_invalid_cb.html
index 27832713e..338577774 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_errorCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_errorCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check argument error callback validation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -44,7 +44,7 @@ var t = async_test("MessageStorage_findFolders_errorCallback_invalid_cb", {timeo
     serviceSuccess, serviceError, findSuccess, filter;
 
 t.step(function () {
-    findSuccess = t.step_func(function() {
+    findSuccess = t.step_func(function () {
         assert_unreached("findFolders success callback should not be called.");
     });
 
@@ -73,7 +73,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
-
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_TypeMismatch.html
index b34c3fb81..d29fb9889 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_filter_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if exception is thrown when incorrect filter given
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -44,11 +44,11 @@ var t = async_test("MessageStorage_findFolders_filter_TypeMismatch", {timeout: 1
     serviceSuccess, serviceError, foldersSuccess, exceptionName, conversionTable, filter;
 
 t.step(function () {
-    foldersSuccess = t.step_func(function() {
+    foldersSuccess = t.step_func(function () {
         assert_unreached("findFolders success callback should not be called.");
     });
 
-    serviceSuccess = t.step_func(function(service) {
+    serviceSuccess = t.step_func(function (service) {
         conversionTable = getTypeConversionExceptions("object", false);
 
         for(i = 0; i < conversionTable.length; i++) {
@@ -72,8 +72,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
-
 </html>
-
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId.html
index 1f522b146..b2b2c1b36 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_filter_serviceId.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 -->
-<html lang="en">
+<html>
 
 <head>
 <title>MessageStorage_findFolders_filter_serviceId</title>
@@ -39,7 +39,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#findFoldersid2466935
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MOA MR
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_missarg.html
index 032d820d7..a614e8c5a 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_missarg</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if exception is thrown when mandatory arguments not given
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
@@ -44,7 +44,7 @@ var t = async_test("MessageStorage_findFolders_missarg", {timeout: 180000}),
     serviceSuccess, serviceError, filter;
 
 t.step(function () {
-    serviceSuccess = t.step_func(function(service) {
+    serviceSuccess = t.step_func(function (service) {
         assert_throws({name: TYPE_MISMATCH_ERR},
             function () {
                 service.messageStorage.findFolders();
@@ -70,7 +70,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
-
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_TypeMismatch.html
index 1673295eb..400707850 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if exception is thrown when incorrect success callback given
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -45,11 +45,11 @@ this_test.step(function () {
     var serviceSuccess, serviceError, msgService, foldersSuccess, exceptionName,
             conversionTable, filter;
 
-    serviceError = this_test.step_func(function(error) {
+    serviceError = this_test.step_func(function (error) {
         assert_unreached("Failed to get MessageServices: " + error.message);
     });
 
-    serviceSuccess = this_test.step_func(function(services) {
+    serviceSuccess = this_test.step_func(function (services) {
         assert_true(services.length > 0, "No message service received.");
         msgService = services[0];
         filter = new tizen.AttributeFilter("serviceId", "EXACTLY", msgService.id);
@@ -77,5 +77,4 @@ this_test.step(function () {
 
 </script>
 </body>
-
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_invalid_cb.html
index 8d0cebb6a..574ad525f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_successCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_successCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check argument success callback validation
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
@@ -50,7 +50,7 @@ t.step(function () {
         })
     };
 
-    serviceSuccess = t.step_func(function(service) {
+    serviceSuccess = t.step_func(function (service) {
         filter = new tizen.AttributeFilter("serviceId", "EXACTLY", service.id);
 
         assert_throws({name: TYPE_MISMATCH_ERR},
@@ -72,5 +72,4 @@ t.step(function () {
 
 </script>
 </body>
-
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_with_errorCallback.html
index 20f0878a8..c2659af33 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_findFolders_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Marcin Kaminski <marcin.ka@samsung.com>
+        Marcin Kaminski <marcin.ka@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_findFolders_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if function executes properly when all mandatory and optional arguments given
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:findFolders M
-//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_notexist.html
index 0171516ba..375bca829 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeChangeListener.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeChangeListener.html
index 4244a06d3..3206a3634 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeChangeListener.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeChangeListener.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if removeChangeListener method with non-optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeChangeListener M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR MAST
@@ -85,7 +85,7 @@ t.step(function () {
         service = emailService;
 
         listenerId = service.messageStorage.addMessagesChangeListener(messageChangeCallback);
-        
+
         message1 = createSimpleMessageTo(TEST_EMAIL_RECIPIENT_2);
 
         message2 = createSimpleMessageTo(TEST_EMAIL_RECIPIENT_2);
@@ -99,6 +99,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations.html
index 4885727c8..e7e7a4b92 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if removeConversations method with non-optional argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR
@@ -41,7 +41,7 @@ setup({timeout: 180000});
 
 var t = async_test("MessageStorage_removeConversations", {timeout: 180000}), returnedValue;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     returnedValue = service.messageStorage.removeConversations([conversation]);
     assert_equals(returnedValue, undefined, "Incorrect returned value");
     t.done();
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_conversations_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_conversations_TypeMismatch.html
index 4e6f07b59..194aecb80 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_conversations_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_conversations_TypeMismatch.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check argument conversations conversions exception for setListener method.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -41,7 +41,7 @@ setup({ timeout: 180000 });
 
 var t = async_test("MessageStorage_removeConversations_conversations_TypeMismatch", {timeout: 180000}), conversionTable;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     conversionTable = getTypeConversionExceptions("array", false);
     for (i = 0; i < conversionTable.length; i++) {
         conversations = conversionTable[i][0];
@@ -53,6 +53,7 @@ message_conversation_test(t, function(service, message, conversation) {
     }
     t.done();
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_TypeMismatch.html
index 6289d62ae..e1ae50f91 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_TypeMismatch.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check argument errorCallback conversions exception for removeConversations method.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -42,7 +42,7 @@ setup({ timeout: 180000 });
 var t = async_test("MessageStorage_removeConversations_errorCallback_TypeMismatch", {timeout: 180000}),
     conversionTable, successCallback, incorrectErrorCallback, exceptionName;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
 
     successCallback = t.step_func(function () {
         assert_unreached("removeConversations() success callback invoked.");
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html
index 1cc19c9c0..770a2a486 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_errorCallback_invalid_cb.html
@@ -35,14 +35,14 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 setup({timeout:180000});
 
 var t = async_test("MessageStorage_removeConversations_errorCallback_invalid_cb", {timeout: 180000}),
     successCallback, errorCallback;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
 
     successCallback = t.step_func(function () {
         assert_unreached("removeConversations() success callback invoked.");
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_foremail.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_foremail.html
index e806e19be..2581d3c64 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_foremail.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_foremail.html
@@ -46,7 +46,7 @@ Authors:
 //==== PRIORITY P2
 //==== LABEL Check if removeConversations works properly for email
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA
@@ -54,7 +54,7 @@ setup({timeout: 180000});
 
 var t =async_test("MessageStorage_removeConversations_foremail", {timeout: 180000}), returnedValue;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     returnedValue = service.messageStorage.removeConversations([conversation]);
     assert_equals(returnedValue, undefined, "Incorrect returned value");
     t.done();
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_missarg.html
index 03da1ec0e..0a302b617 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_missarg.html
@@ -35,13 +35,13 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMA
 setup({timeout:180000});
 
 var t = async_test("MessageStorage_removeConversations_missarg", {timeout: 180000});
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     assert_throws({name: "TypeMismatchError"}, function () {
         service.messageStorage.removeConversations();
     });
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_TypeMismatch.html
index 692d83ab7..92bcf713f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_TypeMismatch.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check argument successCallback conversions exception for removeConversations method.
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
@@ -42,7 +42,7 @@ setup({timeout:180000});
 var t = async_test("MessageStorage_removeConversations_successCallback_TypeMismatch", {timeout: 180000}),
     conversionTable, incorrectCallback, exceptionName;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
     conversionTable = getTypeConversionExceptions("functionObject", true);
     for (i = 0; i < conversionTable.length; i++) {
         incorrectCallback = conversionTable[i][0];
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_invalid_cb.html
index 75cac98ab..c3bc51aaa 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_successCallback_invalid_cb.html
@@ -35,14 +35,14 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 setup({timeout:180000});
 
 var t = async_test("MessageStorage_removeConversations_successCallback_invalid_cb", {timeout: 180000}),
     incorrectSuccessCallback, exceptionName = "TypeMismatchError";
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
 
     incorrectSuccessCallback = {
         onsuccess: t.step_func(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_errorCallback.html
index ebe836f42..fc7b911e5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_errorCallback.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if removeConversations method with optional errorCallback argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR MAST
@@ -42,7 +42,7 @@ setup({timeout: 180000});
 var t = async_test("MessageStorage_removeConversations_with_errorCallback", {timeout: 180000}),
     removeSuccess, removeError, returnedValue, findFilter, findSuccessAfterRemove, findErrorAfterRemove;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
 
     findSuccessAfterRemove = t.step_func(function (conversations) {
         assert_equals(conversations.length, 0, "Conversations not removed");
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_successCallback.html
index e70c0e67d..5c5c1afc0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeConversations_with_successCallback.html
@@ -33,7 +33,7 @@ Authors:
 //==== LABEL: Check if removeConversations method with optional successCallback argument works
 //==== PRIORITY: P2
 //==== SPEC: Tizen Web API:Communication:Messaging:MessageStorage:removeConversations M
-//==== SPEC_URL: https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR
@@ -42,7 +42,7 @@ setup({timeout: 180000});
 var t = async_test("MessageStorage_removeConversations_with_successCallback", {timeout: 180000}),
     removeSuccess, returnedValue;
 
-message_conversation_test(t, function(service, message, conversation) {
+message_conversation_test(t, function (service, message, conversation) {
 
     removeSuccess = t.step_func(function () {
         assert_equals(returnedValue, undefined, "Incorrect returned value");
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessage_emailwithouterrcb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessage_emailwithouterrcb.html
index 7c78a0b97..fad788a57 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessage_emailwithouterrcb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessage_emailwithouterrcb.html
@@ -94,6 +94,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email.html
index 48c4f6854..bcce61487 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_removeMessages_email</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_removeMessages_email
 //==== LABEL Check with non-optional arguments loadMessageBody(valid_message)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMINA MR
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_TypeMismatch.html
index 2af8036a1..fbeccf075 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_TypeMismatch.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageStorage_messaging_email_addDraftMessage</title>
+<title>MessageStorage_removeMessages_email_errorCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument errorCallback conversions exception
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_invalid_cb.html
index bcda1dc22..af0326a57 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_invalid_cb.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageStorage_messaging_email_addDraftMessage</title>
+<title>MessageStorage_removeMessages_email_errorCallback_invalid_cb</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -31,10 +31,10 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageStorage_removeMessages_email_errorCallback_invalid_cb
-//==== LABEL Check argument errorCallback validation - use {onerror: function(){}}
+//==== LABEL Check argument errorCallback validation - use {onerror: function (){}}
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_messages_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_messages_TypeMismatch.html
index 590040380..9b570e259 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_messages_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_messages_TypeMismatch.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageStorage_messaging_email_addDraftMessage</title>
+<title>MessageStorage_removeMessages_email_messages_TypeMismatch</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument MessageStorage_removeMessages_email messages conversions exception
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_missarg.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_missarg.html
index c3deffebb..fa4dcc62b 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_missarg.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageStorage_messaging_email_addDraftMessage</title>
+<title>MessageStorage_removeMessages_email_missarg</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_removeMessages_email_missarg
 //==== LABEL Check with MessageStorage_removeMessages_email missing non-optional argument
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MMA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_TypeMismatch.html
index 7940aced4..d77764f22 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_TypeMismatch.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageStorage_messaging_email_addDraftMessage</title>
+<title>MessageStorage_removeMessages_email_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check argument MessageStorage_removeMessages_email successCallback conversions exception
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MC
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_invalid_cb.html
index d28e308a0..440ff57f1 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_invalid_cb.html
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>MessageStorage_messaging_email_addDraftMessage</title>
+<title>MessageStorage_removeMessages_email_successCallback_invalid_cb</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
@@ -31,10 +31,10 @@ Authors:
 <div id="log"></div>
 <script>
 //==== TEST: MessageStorage_removeMessages_email_successCallback_invalid_cb
-//==== LABEL Check argument successCallbac validation - use {onerror: function(){}}
+//==== LABEL Check argument successCallbac validation - use {onerror: function (){}}
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MTCB
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_errorCallback.html
index 6cc198d66..93bc9ea1f 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_removeMessages_email_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_removeMessages_email_with_errorCallback
 //==== LABEL Check with optional arguments removeMessages(valid_messages, valid_successCallback, valid_errorCallback)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR MAST
diff --git a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_successCallback.html b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_successCallback.html
index c34aef2f4..55730d8b5 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_successCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_with_successCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Tomasz Paciorek <t.paciorek@samsung.com>
+        Tomasz Paciorek <t.paciorek@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessageStorage_removeMessages_email_with_successCallback</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: MessageStorage_removeMessages_email_with_successCallback
 //==== LABEL Check with optional arguments removeMessages(valid_messages, valid_successCallback)
 //==== SPEC Tizen Web API:Communication:Messaging:MessageStorage:removeMessages M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA MOA MR
@@ -82,6 +82,7 @@ t.step(function () {
 
     getEmailService(t, serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_addUpdateRemove.html b/tct-messaging-email-tizen-tests/messaging/Message_addUpdateRemove.html
index 48b8918ae..ea9a68e37 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_addUpdateRemove.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_addUpdateRemove.html
@@ -32,7 +32,7 @@ Authors:
 
 -->
 
-<html lang="en">
+<html>
 
 <head>
 <title>Message_addUpdateRemove</title>
@@ -57,9 +57,9 @@ setup({timeout: 180000});
 
 var t = async_test("Message_addUpdateRemove", {timeout:180000}), service, message, msgs,
         serviceSuccess, serviceError, addDraftSuccess, addDraftError,
-        findSuccess, findError, updateSuccess, updateError, removeSuccess, removeError
+        findSuccess, findError, updateSuccess, updateError, removeSuccess, removeError;
 
-t.step(function() {
+t.step(function () {
 
     removeSuccess = t.step_func(function () {
         t.done();
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_attachments_exist.html b/tct-messaging-email-tizen-tests/messaging/Message_attachments_exist.html
index 55b315d7b..bda2682d0 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_attachments_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_attachments_exist.html
@@ -33,7 +33,7 @@ Authors:
 
 -->
 
-<html lang="en">
+<html>
 
 <head>
 <title>Message_attachments_exist</title>
@@ -59,4 +59,4 @@ test(function () {
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_attachments_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_attachments_attribute.html
index 5af888773..619d8a79d 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_attachments_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_attachments_attribute.html
@@ -16,13 +16,13 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>Message_attachments_attribute</title>
+<title>Message_email_attachments_attribute</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_bcc_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_bcc_attribute.html
index 0e6719ea9..0d29b038e 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_bcc_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_bcc_attribute.html
@@ -16,13 +16,13 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
-<title>Message_to_attribute</title>
+<title>Message_email_bcc_attribute</title>
 <meta charset="utf-8"/>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_body_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_body_attribute.html
index 54d5e4368..ed4c3040b 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_body_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_body_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_body_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_cc_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_cc_attribute.html
index 173955924..45b5d735f 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_cc_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_cc_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_cc_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor.html b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor.html
index cc6b29ccf..4ae80a3b2 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_constructor</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== TEST: Message_email_constructor
 //==== LABEL check new tizen.Message(MessageServiceTag type, MessageInit messageInitDict?) works for email (is supported)
 //==== SPEC Tizen Web API:Communication:Messaging:Message:constructor C
-//==== SPEC_URL TBD
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CONSTRA CONSTRM
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_function.html b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_function.html
index cf2a5d7f1..6ed08a824 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_function.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_function.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
 
-<html lang="en">
+<html>
 <head>
 <title>Message_email_constructor_messageInitDict_function</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: Message_email_constructor_messageInitDict_function
 //==== LABEL check if Message_email_constructor_messageInitDict_function
 //==== SPEC Tizen Web API:Communication:Messaging:Message:constructor C
-//==== SPEC_URL TBD
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CONSTRM
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_object.html b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_object.html
index ce9c7de8d..6d9a2e5b2 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_object.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_messageInitDict_object.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_constructor_messageInitDict_object</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: Message_email_constructor_messageInitDict_object
 //==== LABEL check if Message_email_constructor_messageInitDict_object
 //==== SPEC Tizen Web API:Communication:Messaging:Message:constructor C
-//==== SPEC_URL TBD
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CONSTRM
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_minargs.html b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_minargs.html
index 2ef49ef7e..4410aaea2 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_minargs.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_constructor_minargs.html
@@ -18,13 +18,13 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 
 <head>
-<title> Message_email_constructor_minargs</title>
+<title>Message_email_constructor_minargs</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -36,7 +36,7 @@ Authors:
 //==== TEST: Message_email_constructor_minargs
 //==== LABEL check if Message_email_constructor_minargs
 //==== SPEC Tizen Web API:Communication:Messaging:Message:constructor C
-//==== SPEC_URL TBD
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA CONSTRM CONSTRA
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_conversationId_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_conversationId_attribute.html
index 628515e90..289380760 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_conversationId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_conversationId_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_conversationId_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_extend.html b/tct-messaging-email-tizen-tests/messaging/Message_email_extend.html
index 2343f1b3d..2b829da69 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_extend.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_extend</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== PRIORITY P3
 //==== LABEL Check if instance of interface Message (email) can be extended with new property
 //==== SPEC Tizen Web API:Communication:Messaging:Message:Message U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_folderId_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_folderId_attribute.html
index 03652a688..847dc1eef 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_folderId_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_folderId_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_folderId_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html
index 1ac9ef668..5676fde7a 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_from_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_from_attribute</title>
 <meta charset="utf-8"/>
@@ -108,7 +108,7 @@ t.step(function () {
         assert_unreached("getEmailService() error callback: name:" + error.name + ", msg:" + error.message);
     });
 
-    getEmailService(t, serviceSuccess, serviceError); 
+    getEmailService(t, serviceSuccess, serviceError);
 });
 
 </script>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_hasAttachment_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_hasAttachment_attribute.html
index 2cde2346b..50ac56352 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_hasAttachment_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_hasAttachment_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_hasAttachment_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_id_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_id_attribute.html
index 04c280d78..c73f5bb29 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_id_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_id_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_id_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_inResponseTo_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_inResponseTo_attribute.html
index a8fd0272f..849bbf1b8 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_inResponseTo_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_inResponseTo_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_inResponseTo_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_isHighPriority_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_isHighPriority_attribute.html
index 0cce7d909..d2c68cca5 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_isHighPriority_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_isHighPriority_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_isHighPriority_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_isRead_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_isRead_attribute.html
index 43d4b9ef8..5823d51ef 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_isRead_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_isRead_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_isRead_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_messageStatus_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_messageStatus_attribute.html
index fd9a90956..dec439a13 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_messageStatus_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_messageStatus_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_messageStatus_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_subject_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_subject_attribute.html
index 976cc7316..b37889a55 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_subject_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_subject_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_subject_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_timestamp_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_timestamp_attribute.html
index c396559d6..3e654190a 100755
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_timestamp_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_timestamp_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_timestamp_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_to_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_to_attribute.html
index 49377eda0..b04492946 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_to_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_to_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_to_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_email_type_attribute.html b/tct-messaging-email-tizen-tests/messaging/Message_email_type_attribute.html
index 7c58750b2..941e76e40 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_email_type_attribute.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_email_type_attribute.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Piotr Szydelko <p.szydelko@samsung.com>
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Piotr Szydelko <p.szydelko@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_email_type_attribute</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_exist.html b/tct-messaging-email-tizen-tests/messaging/Message_exist.html
index 3943ca97a..cbcbbdec7 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Message_exist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Message_hasAttachment_exist.html b/tct-messaging-email-tizen-tests/messaging/Message_hasAttachment_exist.html
index 48c58ae06..185d85205 100644
--- a/tct-messaging-email-tizen-tests/messaging/Message_hasAttachment_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/Message_hasAttachment_exist.html
@@ -34,7 +34,7 @@ Authors:
 
 <html>
 <head>
-<title>check if the attribute hasAttachment in Message</title>
+<title>Message_hasAttachment_exist</title>
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/messaging_common.js"></script>
 </head>
@@ -65,6 +65,7 @@ t.step(function () {
 
     tizen.messaging.getMessageServices("messaging.email", serviceSuccess, serviceError);
 });
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_with_filter.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_with_filter.html
index 71a494a81..49cb560af 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_with_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_with_filter.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_email_messagesadded_with_filter</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessagesChangeCallback_email_messagesadded_with_filter
 //==== LABEL Check if MessagesChangeCallback.messagesadded works properly - email, filter
 //==== SPEC Tizen Web API:Communication:Messaging:MessagesChangeCallback:messagesadded M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
@@ -83,7 +83,7 @@ t.step(function () {
         filter = new tizen.AttributeFilter("subject", "EXACTLY", matchMessage.subject);
         watcherId = service.messageStorage.addMessagesChangeListener(changeCallback, filter);
 
-        service.messageStorage.addDraftMessage(mismatchMessage, null, addDraftError);      
+        service.messageStorage.addDraftMessage(mismatchMessage, null, addDraftError);
         service.messageStorage.addDraftMessage(matchMessage, null, addDraftError);
     });
 
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_without_filter.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_without_filter.html
index af1518adb..0b4b50837 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_without_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesadded_without_filter.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_email_messagesadded_without_filter</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessagesChangeCallback_email_messagesadded_without_filter
 //==== LABEL Check if MessagesChangeCallback.messagesadded works properly - email, no filter
 //==== SPEC Tizen Web API:Communication:Messaging:MessagesChangeCallback:messagesadded M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_with_filter.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_with_filter.html
index fd2f82842..1276d8ac0 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_with_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_with_filter.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_email_messagesremoved_with_filter</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessagesChangeCallback_email_messagesremoved_with_filter
 //==== LABEL Check if MessagesChangeCallback.messagesremoved works properly - email, filter
 //==== SPEC Tizen Web API:Communication:Messaging:MessagesChangeCallback:messagesremoved M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_without_filter.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_without_filter.html
index 46838e4c1..99bb17d1e 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_without_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesremoved_without_filter.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_email_messagesremoved_without_filter</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessagesChangeCallback_email_messagesremoved_without_filter
 //==== LABEL Check if MessagesChangeCallback.messagesremoved works properly - email, no filter
 //==== SPEC Tizen Web API:Communication:Messaging:MessagesChangeCallback:messagesremoved M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_with_filter.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_with_filter.html
index 52a5983c0..23378aa47 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_with_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_with_filter.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_email_messagesupdated_with_filter</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessagesChangeCallback_email_messagesupdated_with_filter
 //==== LABEL Check if MessagesChangeCallback.messagesupdated works properly - email, filter
 //==== SPEC Tizen Web API:Communication:Messaging:MessagesChangeCallback:messagesupdated M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBOA CBT
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_without_filter.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_without_filter.html
index 048807aac..912b78b1c 100755
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_without_filter.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_email_messagesupdated_without_filter.html
@@ -16,11 +16,11 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
-    Mariusz Polasinski <m.polasinski@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Mariusz Polasinski <m.polasinski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_email_messagesupdated_without_filter</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== TEST: MessagesChangeCallback_email_messagesupdated_without_filter
 //==== LABEL Check if MessagesChangeCallback.messagesupdated works properly - email, no filter
 //==== SPEC Tizen Web API:Communication:Messaging:MessagesChangeCallback:messagesupdated M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== TEST_CRITERIA CBT CBOA
diff --git a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_notexist.html b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_notexist.html
index 0eb01725f..163208842 100644
--- a/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/MessagesChangeCallback_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>MessagesChangeCallback_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices.html b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices.html
index f9a4e3fc4..3c5534c7a 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_email_getMessageServices</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MR MMINA
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_TypeMismatch.html
index 835f32f1b..f7caf0581 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_email_getMessageServices_errorCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 var t = async_test("Messaging_email_getMessageServices_errorCallback_TypeMismatch", {timeout:180000}),
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_invalid_cb.html
index 12cf1de74..17a4fca8e 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_errorCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_email_getMessageServices_errorCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -34,7 +34,7 @@ Authors:
 //==== LABEL Check if getMessageServices (email) throws exception when errorCallback is invalid
 //==== PRIORITY: P2
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_TypeMismatch.html
index f826bf733..dd623bcf7 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_email_getMessageServices_successCallback_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_invalid_cb.html b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_invalid_cb.html
index 4852ebb7d..a1d6be501 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_invalid_cb.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_successCallback_invalid_cb.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_email_getMessageServices_successCallback_invalid_cb</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MTCB
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_with_errorCallback.html b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_with_errorCallback.html
index 22bfb11fd..504c331f1 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_with_errorCallback.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_email_getMessageServices_with_errorCallback.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_email_getMessageServices_with_errorCallback</title>
 <meta charset="utf-8"/>
@@ -35,7 +35,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MR MOA
 setup({timeout: 180000});
 var t = async_test("Messaging_email_getMessageServices_with_errorCallback", {timeout:180000});
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_extend.html b/tct-messaging-email-tizen-tests/messaging/Messaging_extend.html
index 636518232..ddfb4fc5b 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_extend.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_extend.html
@@ -18,7 +18,7 @@ limitations under the License.
 
 
 Authors:
-    Andrzej Krolikowski <a.krolikowsk@samsung.com>
+        Andrzej Krolikowski <a.krolikowsk@samsung.com>
 
 -->
 <html>
@@ -36,7 +36,7 @@ Authors:
 //==== LABEL check if Messaging is extendable
 //==== PRIORITY P3
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:Messaging U
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA OBX
 
 test(function () {
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_exist.html b/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_exist.html
index b773796db..855d3337a 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_exist.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_exist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_getMessageServices_exist</title>
 <meta charset="utf-8"/>
@@ -33,13 +33,14 @@ Authors:
 //==== TEST: Messaging_getMessageServices_exist
 //==== LABEL Check if method getMessageServices exists
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA ME
 
 test(function () {
     assert_true("getMessageServices" in tizen.messaging, "No getMessageServices method in messaging");
     check_method_exists(tizen.messaging, "getMessageServices");
 }, "Messaging_getMessageServices_exist");
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_messageServiceType_TypeMismatch.html b/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_messageServiceType_TypeMismatch.html
index 247eef0f5..ece3faa23 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_messageServiceType_TypeMismatch.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_messageServiceType_TypeMismatch.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_getMessageServices_messageServiceType_TypeMismatch</title>
 <meta charset="utf-8"/>
@@ -36,7 +36,7 @@ Authors:
 //==== ONLOAD_DELAY 180
 //==== TIMEOUT 180
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MC
 setup({timeout: 180000});
 
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_missarg.html b/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_missarg.html
index 5ed001441..b5b8ed688 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_missarg.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_getMessageServices_missarg.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Lukasz Bardeli <l.bardeli@samsung.com>
+        Lukasz Bardeli <l.bardeli@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_getMessageServices_missarg</title>
 <meta charset="utf-8"/>
@@ -33,7 +33,7 @@ Authors:
 //==== TEST: Messaging_getMessageServices_missarg
 //==== LABEL Check getMessageServices with missing non-optional argument.
 //==== SPEC Tizen Web API:Communication:Messaging:Messaging:getMessageServices M
-//==== SPEC_URL https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html
+//==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html
 //==== TEST_CRITERIA MMA
 test(function () {
     assert_throws({name : TYPE_MISMATCH_ERR},
@@ -41,6 +41,7 @@ test(function () {
             tizen.messaging.getMessageServices();
         }, TYPE_MISMATCH_ERR + " should be thrown - missing argument");
 }, "Messaging_getMessageServices_missarg");
+
 </script>
 </body>
 </html>
diff --git a/tct-messaging-email-tizen-tests/messaging/Messaging_notexist.html b/tct-messaging-email-tizen-tests/messaging/Messaging_notexist.html
index c2b680106..8034e6b17 100755
--- a/tct-messaging-email-tizen-tests/messaging/Messaging_notexist.html
+++ b/tct-messaging-email-tizen-tests/messaging/Messaging_notexist.html
@@ -16,10 +16,10 @@ limitations under the License.
 
 
 Authors:
-    Jakub Siewierski <j.siewierski@samsung.com>
+        Jakub Siewierski <j.siewierski@samsung.com>
 
 -->
-<html lang="en">
+<html>
 <head>
 <title>Messaging_notexist</title>
 <meta charset="utf-8"/>
diff --git a/tct-messaging-email-tizen-tests/tests.full.xml b/tct-messaging-email-tizen-tests/tests.full.xml
index 136050c79..dd54d2128 100644
--- a/tct-messaging-email-tizen-tests/tests.full.xml
+++ b/tct-messaging-email-tizen-tests/tests.full.xml
@@ -22,7 +22,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageArraySuccessCallback" element_type="method" element_name="onsuccess" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -34,7 +34,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageAttachmentSuccessCallback" element_type="method" element_name="onsuccess" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -94,7 +94,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageAttachment" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -106,7 +106,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageAttachment" element_type="attribute" element_name="filePath" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -118,7 +118,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageAttachment" element_type="attribute" element_name="id" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -130,7 +130,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageAttachment" element_type="attribute" element_name="messageId" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -142,7 +142,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageAttachment" element_type="attribute" element_name="mimeType" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -154,7 +154,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBodySuccessCallback" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -178,7 +178,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBodySuccessCallback" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -190,7 +190,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBody" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -202,7 +202,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBody" element_type="attribute" element_name="htmlBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -214,7 +214,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBody" element_type="attribute" element_name="inlineAttachments" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -226,7 +226,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBody" element_type="attribute" element_name="loaded" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -238,7 +238,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBody" element_type="attribute" element_name="messageId" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -250,7 +250,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageBody" element_type="attribute" element_name="plainBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -286,7 +286,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversationArraySuccessCallback" element_type="method" element_name="onsuccess" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -298,7 +298,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="bcc" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -310,7 +310,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="cc" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -322,7 +322,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -334,7 +334,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="from" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -358,7 +358,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="isRead" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -370,7 +370,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="lastMessageId" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -382,7 +382,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="messageCount" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -406,7 +406,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="preview" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -418,7 +418,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="subject" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -430,7 +430,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="timestamp" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -442,7 +442,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="to" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -454,7 +454,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="type" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -466,7 +466,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversation" element_type="attribute" element_name="unreadMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -490,7 +490,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversationsChangeCallback" element_type="method" element_name="conversationsremoved" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -502,7 +502,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageConversationsChangeCallback" element_type="method" element_name="conversationsupdated" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -526,7 +526,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolderArraySuccessCallback" element_type="method" element_name="onsuccess" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -550,7 +550,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="contentType" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html </spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -562,7 +562,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="contentType" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -574,7 +574,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -586,7 +586,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="id" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -598,7 +598,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="name" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -610,7 +610,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="parentId" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -622,7 +622,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="path" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -634,7 +634,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="synchronizable" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -646,7 +646,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="type" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -658,7 +658,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="id" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html </spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -682,7 +682,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="path" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html </spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -694,7 +694,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageFolder" element_type="attribute" element_name="type" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html </spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -742,7 +742,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageRecipientsCallback" element_type="method" element_name="onsuccess" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -766,7 +766,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageServiceArraySuccessCallback" element_type="method" element_name="onsuccess" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -802,7 +802,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -814,7 +814,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -826,7 +826,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -838,7 +838,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -850,7 +850,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -862,7 +862,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -874,7 +874,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -886,7 +886,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -898,7 +898,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -910,7 +910,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -922,7 +922,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -934,7 +934,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -946,7 +946,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -958,7 +958,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -970,7 +970,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -982,7 +982,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -994,7 +994,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1006,7 +1006,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1018,7 +1018,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageBody" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1042,7 +1042,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1054,19 +1054,19 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check argument MessageService.sendMessage (email) errorCallback validation - use {onsuccess: function(){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageService_email_sendMessage_errorCallback_invalid_cb">
+      <testcase purpose="Check argument MessageService.sendMessage (email) errorCallback validation - use {onsuccess: function (){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageService_email_sendMessage_errorCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_invalid_cb.html</test_script_entry>
         </description>
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1078,7 +1078,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1090,7 +1090,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1102,7 +1102,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1114,7 +1114,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1126,19 +1126,19 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check argument MessageService.sendMessage (email) successCallback validation - use {onsuccess: function(){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageService_email_sendMessage_successCallback_invalid_cb">
+      <testcase purpose="Check argument MessageService.sendMessage (email) successCallback validation - use {onsuccess: function (){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageService_email_sendMessage_successCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_invalid_cb.html</test_script_entry>
         </description>
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1150,7 +1150,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1162,7 +1162,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1174,7 +1174,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="stopSync" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1186,7 +1186,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="syncFolder" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1198,7 +1198,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sync" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1258,7 +1258,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sendMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#sendMessageid2463900</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1438,7 +1438,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="sync" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#syncidp342960</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1570,7 +1570,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addConversationsChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1582,7 +1582,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addConversationsChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1594,7 +1594,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1606,7 +1606,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1618,7 +1618,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1630,7 +1630,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1642,7 +1642,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1654,7 +1654,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1666,7 +1666,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1678,7 +1678,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1690,7 +1690,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1702,7 +1702,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1714,7 +1714,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addDraftMessage" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1726,7 +1726,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1738,7 +1738,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1750,7 +1750,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1762,7 +1762,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1774,7 +1774,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1786,7 +1786,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1798,7 +1798,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addFoldersChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#addFoldersChangeListeneridp519184</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1810,7 +1810,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1822,7 +1822,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1834,7 +1834,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1846,7 +1846,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1858,7 +1858,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1870,7 +1870,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1882,7 +1882,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="addMessagesChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1894,7 +1894,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1906,7 +1906,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1918,7 +1918,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1930,7 +1930,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1942,7 +1942,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1954,7 +1954,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1966,7 +1966,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1978,7 +1978,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -1990,7 +1990,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2002,7 +2002,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2014,7 +2014,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2026,7 +2026,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2038,7 +2038,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2050,7 +2050,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2062,7 +2062,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2074,7 +2074,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2086,7 +2086,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2098,7 +2098,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2110,7 +2110,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2122,7 +2122,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2134,7 +2134,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2146,7 +2146,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2158,7 +2158,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2170,7 +2170,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2182,7 +2182,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2194,7 +2194,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeChangeListener" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2206,7 +2206,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2218,7 +2218,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2230,7 +2230,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2242,7 +2242,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2254,7 +2254,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2266,7 +2266,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2278,7 +2278,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2290,7 +2290,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2302,7 +2302,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2314,7 +2314,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2326,7 +2326,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2338,7 +2338,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="updateMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2350,7 +2350,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2362,7 +2362,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2374,7 +2374,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2386,7 +2386,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2398,7 +2398,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html#findFoldersid2466935</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2410,7 +2410,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2422,7 +2422,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2434,7 +2434,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2446,7 +2446,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="findFolders" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.help.web.api.device/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2542,7 +2542,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeConversations" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2626,7 +2626,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2638,19 +2638,19 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check argument errorCallback validation - use {onerror: function(){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_removeMessages_email_errorCallback_invalid_cb">
+      <testcase purpose="Check argument errorCallback validation - use {onerror: function (){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_removeMessages_email_errorCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_invalid_cb.html</test_script_entry>
         </description>
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2662,7 +2662,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2674,7 +2674,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2686,19 +2686,19 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check argument successCallbac validation - use {onerror: function(){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_removeMessages_email_successCallback_invalid_cb">
+      <testcase purpose="Check argument successCallbac validation - use {onerror: function (){}}" type="compliance" onload_delay="180" status="approved" component="TizenAPI/Communication/Messaging" execution_type="auto" priority="P2" id="MessageStorage_removeMessages_email_successCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_invalid_cb.html</test_script_entry>
         </description>
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2710,7 +2710,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2722,7 +2722,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageStorage" element_type="method" element_name="removeMessages" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -2866,7 +2866,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Message" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3034,7 +3034,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessagesChangeCallback" element_type="method" element_name="messagesadded" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3046,7 +3046,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessagesChangeCallback" element_type="method" element_name="messagesadded" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3058,7 +3058,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessagesChangeCallback" element_type="method" element_name="messagesremoved" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3070,7 +3070,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessagesChangeCallback" element_type="method" element_name="messagesremoved" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3082,7 +3082,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessagesChangeCallback" element_type="method" element_name="messagesupdated" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3094,7 +3094,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessagesChangeCallback" element_type="method" element_name="messagesupdated" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3118,7 +3118,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3130,7 +3130,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3142,7 +3142,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3154,7 +3154,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3166,7 +3166,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3178,7 +3178,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3190,7 +3190,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" usage="true" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3202,7 +3202,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3214,7 +3214,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3226,7 +3226,7 @@
         <specs>
           <spec>
             <spec_assertion interface="Messaging" element_type="method" element_name="getMessageServices" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
@@ -3250,7 +3250,7 @@
         <specs>
           <spec>
             <spec_assertion interface="MessageService" element_type="method" element_name="loadMessageAttachment" specification="Messaging" section="Communication" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/index.jsp?topic=/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
+            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/messaging.html</spec_url>
             <spec_statement>TBD</spec_statement>
           </spec>
         </specs>
diff --git a/tct-messaging-email-tizen-tests/tests.xml b/tct-messaging-email-tizen-tests/tests.xml
index eef720524..1a132e20d 100644
--- a/tct-messaging-email-tizen-tests/tests.xml
+++ b/tct-messaging-email-tizen-tests/tests.xml
@@ -443,7 +443,7 @@
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_TypeMismatch.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check argument MessageService.sendMessage (email) errorCallback validation - use {onsuccess: function(){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageService_email_sendMessage_errorCallback_invalid_cb">
+      <testcase purpose="Check argument MessageService.sendMessage (email) errorCallback validation - use {onsuccess: function (){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageService_email_sendMessage_errorCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_errorCallback_invalid_cb.html</test_script_entry>
         </description>
@@ -473,7 +473,7 @@
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_TypeMismatch.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check argument MessageService.sendMessage (email) successCallback validation - use {onsuccess: function(){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageService_email_sendMessage_successCallback_invalid_cb">
+      <testcase purpose="Check argument MessageService.sendMessage (email) successCallback validation - use {onsuccess: function (){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageService_email_sendMessage_successCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageService_email_sendMessage_successCallback_invalid_cb.html</test_script_entry>
         </description>
@@ -1103,7 +1103,7 @@
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_TypeMismatch.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check argument errorCallback validation - use {onerror: function(){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageStorage_removeMessages_email_errorCallback_invalid_cb">
+      <testcase purpose="Check argument errorCallback validation - use {onerror: function (){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageStorage_removeMessages_email_errorCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_errorCallback_invalid_cb.html</test_script_entry>
         </description>
@@ -1123,7 +1123,7 @@
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_TypeMismatch.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check argument successCallbac validation - use {onerror: function(){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageStorage_removeMessages_email_successCallback_invalid_cb">
+      <testcase purpose="Check argument successCallbac validation - use {onerror: function (){}}" onload_delay="180" component="TizenAPI/Communication/Messaging" execution_type="auto" id="MessageStorage_removeMessages_email_successCallback_invalid_cb">
         <description>
           <test_script_entry timeout="180">/opt/tct-messaging-email-tizen-tests/messaging/MessageStorage_removeMessages_email_successCallback_invalid_cb.html</test_script_entry>
         </description>
-- 
2.34.1