diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
index 693b1dd7..99b09290 100644
--- a/Common/sources/commondefines.js
+++ b/Common/sources/commondefines.js
@@ -904,7 +904,7 @@ function OutputMailMerge(mailMergeSendData) {
     this['title'] = mailMergeSendData.getFileName();
     const mailFormat = mailMergeSendData.getMailFormat();
     switch (mailFormat) {
-      case constants.AVS_OFFICESTUDIO_FILE_OTHER_HTMLZIP :
+      case constants.AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML :
         this['type'] = 0;
         break;
       case constants.AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX :
diff --git a/FileConverter/sources/converter.js b/FileConverter/sources/converter.js
index 8abc168d..f9a45fde 100644
--- a/FileConverter/sources/converter.js
+++ b/FileConverter/sources/converter.js
@@ -816,21 +816,16 @@ function* ExecuteTask(ctx, task) {
   let childRes = null;
   let isTimeout = false;
   if (constants.NO_ERROR === error) {
-    if(constants.AVS_OFFICESTUDIO_FILE_OTHER_HTMLZIP === dataConvert.formatTo && cmd.getSaveKey() && !dataConvert.mailMergeSend) {
-      //todo заглушка.вся конвертация на клиенте, но нет простого механизма сохранения на клиенте
-      yield utils.pipeFiles(dataConvert.fileFrom, dataConvert.fileTo);
-    } else {
+    ({childRes, isTimeout} = yield* spawnProcess(ctx, isBuilder, tempDirs, dataConvert, authorProps, getTaskTime, task));
+    if (childRes && 0 !== childRes.status && !isTimeout && task.getFromChanges()
+      && constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML !== dataConvert.formatTo
+      && !formatChecker.isOOXFormat(dataConvert.formatTo) && !cmd.getWopiParams()) {
+      ctx.logger.warn('rollback to save changes to ooxml. See assemblyFormatAsOrigin param. formatTo=%s', formatChecker.getStringFromFormat(dataConvert.formatTo));
+      let extOld = path.extname(dataConvert.fileTo);
+      let extNew = '.' + formatChecker.getStringFromFormat(constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML);
+      dataConvert.formatTo = constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML;
+      dataConvert.fileTo = dataConvert.fileTo.slice(0, -extOld.length) + extNew;
       ({childRes, isTimeout} = yield* spawnProcess(ctx, isBuilder, tempDirs, dataConvert, authorProps, getTaskTime, task));
-      if (childRes && 0 !== childRes.status && !isTimeout && task.getFromChanges()
-        && constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML !== dataConvert.formatTo
-        && !formatChecker.isOOXFormat(dataConvert.formatTo) && !cmd.getWopiParams()) {
-        ctx.logger.warn('rollback to save changes to ooxml. See assemblyFormatAsOrigin param. formatTo=%s', formatChecker.getStringFromFormat(dataConvert.formatTo));
-        let extOld = path.extname(dataConvert.fileTo);
-        let extNew = '.' + formatChecker.getStringFromFormat(constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML);
-        dataConvert.formatTo = constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML;
-        dataConvert.fileTo = dataConvert.fileTo.slice(0, -extOld.length) + extNew;
-        ({childRes, isTimeout} = yield* spawnProcess(ctx, isBuilder, tempDirs, dataConvert, authorProps, getTaskTime, task));
-      }
     }
     if(clientStatsD) {
       clientStatsD.timing('conv.spawnSync', new Date() - curDate);