diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index de4b44cecba..74d015fd84e 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -59,23 +59,23 @@ importers:
         specifier: ^0.7.3
         version: 0.7.3
       '@hcengineering/communication-client-query':
-        specifier: ^0.7.0
-        version: 0.7.0
+        specifier: ^0.7.2
+        version: 0.7.2
       '@hcengineering/communication-rest-client':
-        specifier: ^0.7.0
-        version: 0.7.0
+        specifier: ^0.7.2
+        version: 0.7.2
       '@hcengineering/communication-sdk-types':
-        specifier: ^0.7.0
-        version: 0.7.0
+        specifier: ^0.7.2
+        version: 0.7.2
       '@hcengineering/communication-server':
-        specifier: ^0.7.0
-        version: 0.7.0
+        specifier: ^0.7.2
+        version: 0.7.2
       '@hcengineering/communication-shared':
-        specifier: ^0.7.0
-        version: 0.7.0
+        specifier: ^0.7.2
+        version: 0.7.2
       '@hcengineering/communication-types':
-        specifier: ^0.7.0
-        version: 0.7.0
+        specifier: ^0.7.2
+        version: 0.7.2
       '@hcengineering/core':
         specifier: ^0.7.3
         version: 0.7.3
@@ -2991,29 +2991,29 @@ packages:
   '@hcengineering/collaborator-client@0.7.3':
     resolution: {integrity: sha512-WBJtwGM+s2WPbUFbcNVlStf7j15ryqgQWXL+G1KpQhK8UCtS5ii5v0UqC4QxaaCC5Y0it4uKTHtJK/Sa/r/ZCw==}
 
-  '@hcengineering/communication-client-query@0.7.0':
-    resolution: {integrity: sha512-jkhRNFmpGC+uCEKJ8joBYciu71Rqpw0CwLCxXLyF0KyJbraFH9AjGWiJ3ZHlqBuiZUeg9W/KEhyBLmtysT9UmA==}
+  '@hcengineering/communication-client-query@0.7.2':
+    resolution: {integrity: sha512-+q+YBk7SxsS4VtyOE5MXS9M9N6dYZZdYY3TOuYrnFAygH7x7e4Vjb5zP8Q7HamIoytp5u0mvDlwa8r4oYfd9dA==}
 
-  '@hcengineering/communication-cockroach@0.7.0':
-    resolution: {integrity: sha512-pHl+KnZzcBwZ3hJhgvRqPnD1NYP1TF/zjMIucBa7X5OnFKcmnUrIZzSE1u+xPXMjltj0WNAzw3zmTMv2WS9q2A==}
+  '@hcengineering/communication-cockroach@0.7.2':
+    resolution: {integrity: sha512-OzbSE2bcn4+pEZb/W2jEDvKSRZjpQdereTVqzV/Ets6JmqarO8dtzxKuL7QtCTdxnWECDgc4LkTtq+4azKnJXw==}
 
-  '@hcengineering/communication-query@0.7.0':
-    resolution: {integrity: sha512-dZLF0zLaGAZEVwKSgCWHoNPNyhGAU96FdhN9OsvJJxZzNhoVYqWBJOqLkzBOcFGSjFf1lu/wtu7mJP1KxPZakQ==}
+  '@hcengineering/communication-query@0.7.2':
+    resolution: {integrity: sha512-cBy2B/i3TlL9Uwq4yNhM+P4twSR8MbDFoBB7BihowS1Em12vGVtYnngNwj50fZszbVTHleiHOg0rFlfwsFX5Ow==}
 
-  '@hcengineering/communication-rest-client@0.7.0':
-    resolution: {integrity: sha512-AjGIOSQuG29QuNGKmFgaZZU2RaxStjaTJy3HU5YBcU83f8sYHxbjA+qJXiFmwDCnQbe5M+HX0QlZ9HOpOuwxvw==}
+  '@hcengineering/communication-rest-client@0.7.2':
+    resolution: {integrity: sha512-j5tMKk090mvBWlFWKukO+opebF4Sn6jFM5tztpDh1/EkCHdwEF7Si0k4l3Nl62wtW4XoF8E18Drb3sjzLViBBg==}
 
-  '@hcengineering/communication-sdk-types@0.7.0':
-    resolution: {integrity: sha512-N4I8YqEJ6ByzIc4bn3+wmkSr3O79EQArdfaJtt+b4mPGi3sZwYO9XWhql67lpM7kMBuF74TbCiNKCmvDclE+gQ==}
+  '@hcengineering/communication-sdk-types@0.7.2':
+    resolution: {integrity: sha512-L8a/ho8YEScD15/p/WRXY/KcK/aiarlpOLTG+eFXLer9FK9I4nTaqTQt1M2CwTsa/HTsrTXvVryr2IGVyWOLww==}
 
-  '@hcengineering/communication-server@0.7.0':
-    resolution: {integrity: sha512-xkB4CuI/i5jK8q+NyC6RjyLQSwdCgMoI7u5F84g9lGhirtgPQmPhUiH8rSmWJVDfbzpklFGNUSwD6BqZqEAmzA==}
+  '@hcengineering/communication-server@0.7.2':
+    resolution: {integrity: sha512-UDPPxeF3DkQGMNYktbHWdThu8ZI7aLZCR6IOkfhLQ5N2P/1HkZNwMgWWbxYXHG9Z761S1XaqwaaoQ3fxQ1nSlA==}
 
-  '@hcengineering/communication-shared@0.7.0':
-    resolution: {integrity: sha512-os3KXdjCEzys5Zc87Ab00BMBxb2QAfRsOwof5DKm+3GhdbD507F7QtqYMe0zFKplVqiSUkuXWmlEwnbrA0vS1A==}
+  '@hcengineering/communication-shared@0.7.2':
+    resolution: {integrity: sha512-C7OUQbdKeEL3e1YVTrDnutKL6PBkHj6fcaal2H0uIKoH4z1Gr4mYKLPgIp5etTFWHqpeQ6ToB7gkkSIN1p5iIg==}
 
-  '@hcengineering/communication-types@0.7.0':
-    resolution: {integrity: sha512-4qh3PGYcm6HuczTwXp4iPlsx6ChGnCOQ54fhj/PRWgWT2nuY63jOp9ZWwxrOEblsmOkcWcBrrfdmvddmz+fZBw==}
+  '@hcengineering/communication-types@0.7.2':
+    resolution: {integrity: sha512-VO4WI3q7kQFr0Az4rZczD2n3+hAYPO2NCAUhyXWDXWNBV/FFwOgnCn8FdnoqslKJ2j34VuDQNEGJ6PUD4nVqnA==}
 
   '@hcengineering/core@0.7.3':
     resolution: {integrity: sha512-twB7xtB5gQR5cohRwsI9X5V9360T7pQTvrcQBva2dg9GVKw/mWPhTqYe3zADp0nOEhiygLB3W2e1+e/92NwzKQ==}
@@ -4453,7 +4453,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/activity-resources@file:projects/activity-resources.tgz':
-    resolution: {integrity: sha512-k8BOGhC1ijMno6me8Ul8BT3UHINHJBHo73NrQN+Is9D9CHQn6ia9Ws14ONHmdx+AIufaV69uyFgljr/duqwJOw==, tarball: file:projects/activity-resources.tgz}
+    resolution: {integrity: sha512-JFyaYqfXws5HKb1fP1/lrDXLADpLvXVKJU4yL3l2G+6hE0rOrnrEqGmuvpgue1vF+NU0L5orOus++z5+h5VLSQ==, tarball: file:projects/activity-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/activity@file:projects/activity.tgz':
@@ -4581,7 +4581,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/card-resources@file:projects/card-resources.tgz':
-    resolution: {integrity: sha512-UcnJWSkvKEYdEGMfqdAzSPnFKybOaz0aPAMWwefm2HFZ+6bcwCEQsAtxwr6XBPtrGMBsZ49qyXlNxoxJ2HSfHA==, tarball: file:projects/card-resources.tgz}
+    resolution: {integrity: sha512-Lwag8/V40N85JJUFNPFpDpCMDtiXMhu/NMH/hSt3ESfAQS1OVyGX8gcVb2GIK3LvvV6MPsMAqktFEtQNU/5bwQ==, tarball: file:projects/card-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/card@file:projects/card.tgz':
@@ -4593,7 +4593,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/chat-resources@file:projects/chat-resources.tgz':
-    resolution: {integrity: sha512-idg+I0HrvpE7wxH7y7ZcxmI2dvPkye9a6Ed/QVude+vwVFlG3MeSTq2/m2/9CmiMkD+HC4ngWFHDMbElVcaDcw==, tarball: file:projects/chat-resources.tgz}
+    resolution: {integrity: sha512-lyPHjN6iXCYudMehPZJ6MC+5Xy0o4a6OPh0x7BifbNmKM4n3/9TSjfT/jVpYiN4SsI/PcXiwEq1TUe0zlfWh/w==, tarball: file:projects/chat-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/chat@file:projects/chat.tgz':
@@ -4621,11 +4621,11 @@ packages:
     version: 0.0.0
 
   '@rush-temp/communication-resources@file:projects/communication-resources.tgz':
-    resolution: {integrity: sha512-UgUdkJjnJwfn8l1UBhNFFnGir3pT56UD+0H0Ua2pMrHaNIj0VyWMCGF5P6+Z6ieVGK1rcD5Yl5Xzn/pMqqyZAA==, tarball: file:projects/communication-resources.tgz}
+    resolution: {integrity: sha512-oGEnT4Mc4W3+O+ZmwbTHmxxSFiFXjLJMDJMbnJjlhE4x3eqw5ga2ibal4XUKaRptPoCCVtC7Ysb6nDZY1QT8Vg==, tarball: file:projects/communication-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/communication@file:projects/communication.tgz':
-    resolution: {integrity: sha512-wHkGW5U9G0LDFi02ajd0lNGgtnuh/NJhrVfkpTjsSR5Fo6xuzjLdnKk77MrAf8SrjOn3B18KorRBgl1n2IDDQQ==, tarball: file:projects/communication.tgz}
+    resolution: {integrity: sha512-FyDMC7lDnKkHxuDt/n20Zwvpy4TkqJkachzp7CCZJnB557LpL/w1+39lk9xmAdqbFeQCqEJWeyPH64spqv1B2g==, tarball: file:projects/communication.tgz}
     version: 0.0.0
 
   '@rush-temp/contact-assets@file:projects/contact-assets.tgz':
@@ -4681,7 +4681,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/desktop@file:projects/desktop.tgz':
-    resolution: {integrity: sha512-v9UHlAG7WR754XFsj19v/vHXQrvyTdG1NP9Dqq77noDv/qHAK3OLyDs3kqGNkbw8F1hdAZ4B/zUGrGmsN9FuXw==, tarball: file:projects/desktop.tgz}
+    resolution: {integrity: sha512-pCXSEXOTVutZrMKNqb1CafRBIoSLa9QvHkrsbIWUafKExKbMDoyHtNHcO+iC8Pcc4Pk3EA4jwx7UcaJlb1lNBQ==, tarball: file:projects/desktop.tgz}
     version: 0.0.0
 
   '@rush-temp/devmodel-resources@file:projects/devmodel-resources.tgz':
@@ -4909,7 +4909,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/mail-common@file:projects/mail-common.tgz':
-    resolution: {integrity: sha512-SXCQN2ys+4/tA2L/8tf6md+RnIEGmbz3eP+xFh4JrHJyMFa50sO6SzxYwX25A6jwcPRkAgCCrxx1ZywCP4bTPQ==, tarball: file:projects/mail-common.tgz}
+    resolution: {integrity: sha512-Q7HrNanKWhvb935MCevB3lkaIwXKuX3GkSLSZImtMiB/QB+6z8yzlwrVbQ1bPkuxoJOyYBOxRw161VRkiOY42Q==, tarball: file:projects/mail-common.tgz}
     version: 0.0.0
 
   '@rush-temp/mail@file:projects/mail.tgz':
@@ -4985,7 +4985,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/model-communication@file:projects/model-communication.tgz':
-    resolution: {integrity: sha512-NNT3EGxBVmkyiueaTm6b0RI7hkW2NPedKv1jHvgTT5ZjoHYjWtovLT66GBYY35vc5wyfZFcws3MESJKJK/CnMg==, tarball: file:projects/model-communication.tgz}
+    resolution: {integrity: sha512-ijTccrBhXuU9vfkFbCWzwF3XhAXSBxxqDRjd/Q38PinXipu3er2t/bz+7AUwCTf6Hp0f6WkP8xxaVsdZEsbSLg==, tarball: file:projects/model-communication.tgz}
     version: 0.0.0
 
   '@rush-temp/model-contact@file:projects/model-contact.tgz':
@@ -5377,7 +5377,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-fulltext@file:projects/pod-fulltext.tgz':
-    resolution: {integrity: sha512-aXpZB3ucKYsZE4nfhNIfIeUngzm5L2KR0AnfyWvrnxmETyK8S4uNHmj0E6E8yR5pOkaVtsUilGiE4mzJsrze1Q==, tarball: file:projects/pod-fulltext.tgz}
+    resolution: {integrity: sha512-ffvo5ffy0Bx2WI2YqnFTN7uR0r5bbf1J/lUzIrqmwseyg+HH4Rj4T3t/XILi270wpqEx9gay/e3lIxboBmVZtg==, tarball: file:projects/pod-fulltext.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-github@file:projects/pod-github.tgz':
@@ -5385,7 +5385,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-gmail@file:projects/pod-gmail.tgz':
-    resolution: {integrity: sha512-QqbEqudRWOC1Vp4hV5z1Suy1H2cX5SewA8jJcE7fkG27EBYuGylSUFN1DsK45m83sY/GdjhTwY1HBtKGqeBicg==, tarball: file:projects/pod-gmail.tgz}
+    resolution: {integrity: sha512-H3gqYsJg6ErnBFhIn/UL0V2x3jf6/C1yO8CcOswRoaFLlZt5mKuQPJdwzZL9TbiItP8WC0+eiRm4VV6MqcEg3w==, tarball: file:projects/pod-gmail.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-love@file:projects/pod-love.tgz':
@@ -5393,7 +5393,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-mail-worker@file:projects/pod-mail-worker.tgz':
-    resolution: {integrity: sha512-63BeZDBqZg0LcTIigZmg0CDfPfejD+yEeSJ71NfQoRu+ISdL3fLx64zsBqpH+4pT3xqq4vxio2Xm3chsoE00+g==, tarball: file:projects/pod-mail-worker.tgz}
+    resolution: {integrity: sha512-XJ9x7aTYMMQndohiNckQQCdgc5hAgVtv5cxk+MTKjQTUufdpNN0zTcJ2ZgPUdaZV3IBqQMUdoxx6gaszzL+UuQ==, tarball: file:projects/pod-mail-worker.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-mail@file:projects/pod-mail.tgz':
@@ -5401,7 +5401,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-media@file:projects/pod-media.tgz':
-    resolution: {integrity: sha512-AwnXNiJP45WUCqO4dwNBpV9h5sUB2KPg9B118u/LJUjqV3fpy79cj3l+K6MZrmYiXfYy0/MDHzgAKtOLgvgbDg==, tarball: file:projects/pod-media.tgz}
+    resolution: {integrity: sha512-/5MUxRZFYOAiCpuKVdgsCQtFuEG4Mu0iXWS555J8XLMF/ZPCVW+k5dFWvf+GNieG2U/48NuF9g2I+2PXYW1v1Q==, tarball: file:projects/pod-media.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-notification@file:projects/pod-notification.tgz':
@@ -5417,11 +5417,11 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-process@file:projects/pod-process.tgz':
-    resolution: {integrity: sha512-bUUtITt9sr+d5HbZk8D0kp/jauxwHgA3gC4xliFmkF1YPHEzTYN+9cmSKAYidE/VZVl9R4a4E9ZCF7JvDAGp6A==, tarball: file:projects/pod-process.tgz}
+    resolution: {integrity: sha512-m9O7usdfu1O6tApKV7RJYA6rP9Vi29hvh9PBuv82T7F2QzVgDpG4IgBeQEDS2Gg3Eb8ejEObiA216ru0+y5opA==, tarball: file:projects/pod-process.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-server@file:projects/pod-server.tgz':
-    resolution: {integrity: sha512-NKfk6U6zp5N4+icUWj3mhqAZqR0SeMmbghRBdatOMK6QziSvXPjENiD9RVlYsJy9ihtng9+VxEGvoo0WD4I8YQ==, tarball: file:projects/pod-server.tgz}
+    resolution: {integrity: sha512-8c7EOXlT+XoieEewQZz7QYrbfsfyvLX5cjqvVRuT+xC0Q+fX9Obz1jQMKTFq8ZNVGSkSjt9UPf1jXL6h14h2Pg==, tarball: file:projects/pod-server.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-sign@file:projects/pod-sign.tgz':
@@ -5441,7 +5441,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-translate@file:projects/pod-translate.tgz':
-    resolution: {integrity: sha512-H4IY5HaeZxyLVAtFdNNYBTnSNt5HkstDH1nyiZNzXTkR8o5vDjDh2fA75R8KBEjFsvqKgNqmUW7auu6hzmnUPg==, tarball: file:projects/pod-translate.tgz}
+    resolution: {integrity: sha512-nd4iUp2Yg+jQZhDGJR1pREi0aN0XbpZhiNMS3D8DDnssYbXXQMlGUak8VOS31d52tCMt88wuI+l81y8AoK47bg==, tarball: file:projects/pod-translate.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-worker@file:projects/pod-worker.tgz':
@@ -5469,7 +5469,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/presentation@file:projects/presentation.tgz':
-    resolution: {integrity: sha512-sc1CWSuYk4C+6L7oudeWALSszAb13Lg2I04+uvC6Yxw0v5Co+p7q8dZFZ2l1Q+ZVEzemjWWOnhpLRwQHxBUKoQ==, tarball: file:projects/presentation.tgz}
+    resolution: {integrity: sha512-Weew8XNdCG0uJ+NYzVE31z+Ns8kKZQUpUoW++V0RQH/JvkXJfBOqxp1ku9lKXNWhmPqCvT6tscfk7qWNJOIAvQ==, tarball: file:projects/presentation.tgz}
     version: 0.0.0
 
   '@rush-temp/print-assets@file:projects/print-assets.tgz':
@@ -5585,7 +5585,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-activity-resources@file:projects/server-activity-resources.tgz':
-    resolution: {integrity: sha512-Wwdhz8pNsiGTyEleYHU6gvjDozWKdMaKxVb/07WKN7vGPpqgeGdt0BwCgK3aaKfuO0741iBJH6TEUHOmGS4/OQ==, tarball: file:projects/server-activity-resources.tgz}
+    resolution: {integrity: sha512-fC6ZYgQ0NYPkqdsn6/4MdSPpN0Z94GwXmLDzC/vSUYCdPIxAnO7aIofbCTvyi9Ab/yZLru0DtxLSzRA7DozD7A==, tarball: file:projects/server-activity-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-activity@file:projects/server-activity.tgz':
@@ -5629,7 +5629,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-card-resources@file:projects/server-card-resources.tgz':
-    resolution: {integrity: sha512-MVGsDVChdwEHwfBOiRlISVkQ/eHXvCObjiYeFEJDSQUu1VYEUiqeXjReVmmpPhDxePGYFFmVIt+QE8LOwylCMw==, tarball: file:projects/server-card-resources.tgz}
+    resolution: {integrity: sha512-4sXG7Ygk4AjtbP5DjRyYMkyluF/RRfHkcNoFmOin4G2pRZI5/DrxDHCuhBBqzyauCYeXdLPLmbfrEMbU5UOkyw==, tarball: file:projects/server-card-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-card@file:projects/server-card.tgz':
@@ -5721,7 +5721,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-indexer@file:projects/server-indexer.tgz':
-    resolution: {integrity: sha512-MfhOaIWeeuaz+Mus842y7CZcs3Z3YRrCDg2pUKmgfTLhbhSPbhkCT1PSElWW4VbUmCfqH8PAdhE0bmh7h5/8BQ==, tarball: file:projects/server-indexer.tgz}
+    resolution: {integrity: sha512-byEuwSsWUC/RiMzXbuT06apgi1n2jOfHTNMQxLRdwt+rW00ruH/D0Qn40HcZPN7m2AykN7uQDvDuZTxBZBhxSw==, tarball: file:projects/server-indexer.tgz}
     version: 0.0.0
 
   '@rush-temp/server-inventory-resources@file:projects/server-inventory-resources.tgz':
@@ -5757,7 +5757,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-pipeline@file:projects/server-pipeline.tgz':
-    resolution: {integrity: sha512-uvllffYDvFL9MOKGa7XtfYoFEnD/j1QuYeQd/4igfmS0N+3XAEyNDzYKPkiIzNMkgreFazJzfHAQqK/5RMEMrQ==, tarball: file:projects/server-pipeline.tgz}
+    resolution: {integrity: sha512-Qaky/4WWMK8/5AbB5b7TIf4PSWaSeQILBUZrPHTjMnXzG733NG0uYU7+tPejEXSUeTWve9IFuqQ71cFYi+MhHw==, tarball: file:projects/server-pipeline.tgz}
     version: 0.0.0
 
   '@rush-temp/server-preference@file:projects/server-preference.tgz':
@@ -5997,7 +5997,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/tool@file:projects/tool.tgz':
-    resolution: {integrity: sha512-I8ZlYeK3rReOAH9E5XPnfwLUCI8K6sGiEVXxvPm8OrtZNiet2UUAMNcj+l/FnEMsp5uxTEZ9mEM/2+Qkc1YO3Q==, tarball: file:projects/tool.tgz}
+    resolution: {integrity: sha512-/YEc8V2Ug/st84mFkHoH4ZqhtQrjdkrUsqos/UwLaEwepU4wIaHGwMISmieV+CzLpVn7SFIWFIdhokMR+q21dg==, tarball: file:projects/tool.tgz}
     version: 0.0.0
 
   '@rush-temp/tracker-assets@file:projects/tracker-assets.tgz':
@@ -15631,51 +15631,51 @@ snapshots:
     dependencies:
       '@hcengineering/core': 0.7.3
 
-  '@hcengineering/communication-client-query@0.7.0':
+  '@hcengineering/communication-client-query@0.7.2':
     dependencies:
-      '@hcengineering/communication-query': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-query': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/hulylake-client': 0.7.3
       fast-equals: 5.2.2
 
-  '@hcengineering/communication-cockroach@0.7.0':
+  '@hcengineering/communication-cockroach@0.7.2':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       postgres: 3.4.7
       uuid: 8.3.2
 
-  '@hcengineering/communication-query@0.7.0':
+  '@hcengineering/communication-query@0.7.2':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/hulylake-client': 0.7.3
       fast-equals: 5.2.2
       uuid: 8.3.2
 
-  '@hcengineering/communication-rest-client@0.7.0':
+  '@hcengineering/communication-rest-client@0.7.2':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       snappyjs: 0.7.0
 
-  '@hcengineering/communication-sdk-types@0.7.0':
+  '@hcengineering/communication-sdk-types@0.7.2':
     dependencies:
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
 
-  '@hcengineering/communication-server@0.7.0':
+  '@hcengineering/communication-server@0.7.2':
     dependencies:
       '@hcengineering/account-client': 0.7.3
-      '@hcengineering/communication-cockroach': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-cockroach': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/hulylake-client': 0.7.3
       '@hcengineering/server-token': 0.7.2
@@ -15685,13 +15685,13 @@ snapshots:
       uuid: 8.3.2
       zod: 3.24.2
 
-  '@hcengineering/communication-shared@0.7.0':
+  '@hcengineering/communication-shared@0.7.2':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/hulylake-client': 0.7.3
 
-  '@hcengineering/communication-types@0.7.0':
+  '@hcengineering/communication-types@0.7.2':
     dependencies:
       '@hcengineering/core': 0.7.3
 
@@ -15880,8 +15880,8 @@ snapshots:
   '@hcengineering/server-core@0.7.0':
     dependencies:
       '@hcengineering/analytics': 0.7.3
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/query': 0.7.3
@@ -17964,7 +17964,7 @@ snapshots:
   '@rush-temp/activity-resources@file:projects/activity-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(postcss@8.5.3)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
       '@hcengineering/analytics': 0.7.3
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -19112,7 +19112,7 @@ snapshots:
     dependencies:
       '@hcengineering/account-client': 0.7.3
       '@hcengineering/analytics': 0.7.3
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -19223,8 +19223,8 @@ snapshots:
   '@rush-temp/chat-resources@file:projects/chat-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(postcss@8.5.3)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
       '@hcengineering/analytics': 0.7.3
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -19516,8 +19516,8 @@ snapshots:
   '@rush-temp/communication-resources@file:projects/communication-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
       '@hcengineering/analytics': 0.7.3
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -19572,7 +19572,7 @@ snapshots:
 
   '@rush-temp/communication@file:projects/communication.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -20040,7 +20040,7 @@ snapshots:
     dependencies:
       '@hcengineering/client': 0.7.3
       '@hcengineering/client-resources': 0.7.3
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -22123,10 +22123,10 @@ snapshots:
     dependencies:
       '@hcengineering/account-client': 0.7.3
       '@hcengineering/api-client': 0.7.3(bufferutil@4.0.8)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(utf-8-validate@6.0.4)
-      '@hcengineering/communication-rest-client': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-rest-client': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/platform-rig': 0.7.10
@@ -22725,7 +22725,7 @@ snapshots:
 
   '@rush-temp/model-communication@file:projects/model-communication.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/model': 0.7.3
       '@hcengineering/platform': 0.7.3
@@ -25943,8 +25943,8 @@ snapshots:
       '@hcengineering/analytics-service': 0.7.3(encoding@0.1.13)
       '@hcengineering/client': 0.7.3
       '@hcengineering/client-resources': 0.7.3
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-server': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-server': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/elastic': 0.7.0
       '@hcengineering/hulylake-client': 0.7.3
@@ -26119,8 +26119,8 @@ snapshots:
       '@hcengineering/api-client': 0.7.3(bufferutil@4.0.8)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(utf-8-validate@6.0.4)
       '@hcengineering/client': 0.7.3
       '@hcengineering/client-resources': 0.7.3
-      '@hcengineering/communication-rest-client': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
+      '@hcengineering/communication-rest-client': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/platform': 0.7.3
@@ -26245,9 +26245,9 @@ snapshots:
       '@hcengineering/account-client': 0.7.3
       '@hcengineering/analytics-service': 0.7.3(encoding@0.1.13)
       '@hcengineering/api-client': 0.7.3(bufferutil@4.0.8)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(utf-8-validate@6.0.4)
-      '@hcengineering/communication-rest-client': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-rest-client': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/platform': 0.7.3
@@ -26356,8 +26356,8 @@ snapshots:
       '@hcengineering/analytics': 0.7.3
       '@hcengineering/analytics-service': 0.7.3(encoding@0.1.13)
       '@hcengineering/api-client': 0.7.3(bufferutil@4.0.8)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(utf-8-validate@6.0.4)
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/platform': 0.7.3
@@ -26559,8 +26559,8 @@ snapshots:
       '@hcengineering/analytics': 0.7.3
       '@hcengineering/analytics-service': 0.7.3(encoding@0.1.13)
       '@hcengineering/api-client': 0.7.3(bufferutil@4.0.8)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(utf-8-validate@6.0.4)
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/platform': 0.7.3
@@ -26610,7 +26610,7 @@ snapshots:
       '@hcengineering/account-client': 0.7.3
       '@hcengineering/analytics': 0.7.3
       '@hcengineering/analytics-service': 0.7.3(encoding@0.1.13)
-      '@hcengineering/communication-server': 0.7.0
+      '@hcengineering/communication-server': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/middleware': 0.7.1
@@ -26931,9 +26931,9 @@ snapshots:
       '@hcengineering/analytics': 0.7.3
       '@hcengineering/analytics-service': 0.7.3(encoding@0.1.13)
       '@hcengineering/api-client': 0.7.3(bufferutil@4.0.8)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(utf-8-validate@6.0.4)
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/hulylake-client': 0.7.3
       '@hcengineering/kafka': 0.7.0
@@ -27200,10 +27200,10 @@ snapshots:
       '@hcengineering/analytics': 0.7.3
       '@hcengineering/client': 0.7.3
       '@hcengineering/collaborator-client': 0.7.3
-      '@hcengineering/communication-client-query': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-client-query': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/hulylake-client': 0.7.3
       '@hcengineering/platform': 0.7.3
@@ -28231,8 +28231,8 @@ snapshots:
 
   '@rush-temp/server-activity-resources@file:projects/server-activity-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -28567,8 +28567,8 @@ snapshots:
 
   '@rush-temp/server-card-resources@file:projects/server-card-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.10
@@ -29253,10 +29253,10 @@ snapshots:
   '@rush-temp/server-indexer@file:projects/server-indexer.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))':
     dependencies:
       '@hcengineering/analytics': 0.7.3
-      '@hcengineering/communication-rest-client': 0.7.0
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-shared': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-rest-client': 0.7.2
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-shared': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/hulylake-client': 0.7.3
       '@hcengineering/platform': 0.7.3
@@ -29533,8 +29533,8 @@ snapshots:
 
   '@rush-temp/server-pipeline@file:projects/server-pipeline.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))':
     dependencies:
-      '@hcengineering/communication-sdk-types': 0.7.0
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-sdk-types': 0.7.2
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/kafka': 0.7.0
       '@hcengineering/middleware': 0.7.1
@@ -31545,7 +31545,7 @@ snapshots:
       '@hcengineering/client': 0.7.3
       '@hcengineering/client-resources': 0.7.3
       '@hcengineering/collaboration': 0.7.0(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)
-      '@hcengineering/communication-types': 0.7.0
+      '@hcengineering/communication-types': 0.7.2
       '@hcengineering/core': 0.7.3
       '@hcengineering/datalake': 0.7.0
       '@hcengineering/elastic': 0.7.0
diff --git a/desktop/package.json b/desktop/package.json
index 4b868336527..eef450e1b5e 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -273,7 +273,7 @@
     "electron-updater": "^6.3.4",
     "livekit-client": "^2.15.6",
     "@hcengineering/server-backup": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
     "ws": "^8.18.2"
   },
   "productName": "Huly Desktop",
diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
index 53476d9f3cf..e92ec2bcad5 100644
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@@ -562,22 +562,22 @@ services:
       - QUEUE_CONFIG=${QUEUE_CONFIG}
       - QUEUE_REGION=cockroach
     restart: unless-stopped
-  translate:
-    image: hardcoreeng/translate
-    extra_hosts:
-      - 'huly.local:host-gateway'
-    depends_on:
-      redpanda:
-        condition: service_started
-      account:
-        condition: service_started
-    environment:
-      - SECRET=secret
-      - ACCOUNTS_URL=http://huly.local:3000
-      - HULYLAKE_URL=http://huly.local:8096
-      - QUEUE_CONFIG=${QUEUE_CONFIG}
-      - QUEUE_REGION=cockroach
-    restart: unless-stopped
+#  translate:
+#    image: hardcoreeng/translate
+#    extra_hosts:
+#      - 'huly.local:host-gateway'
+#    depends_on:
+#      redpanda:
+#        condition: service_started
+#      account:
+#        condition: service_started
+#    environment:
+#      - SECRET=secret
+#      - ACCOUNTS_URL=http://huly.local:3000
+#      - HULYLAKE_URL=http://huly.local:8096
+#      - QUEUE_CONFIG=${QUEUE_CONFIG}
+#      - QUEUE_REGION=cockroach
+#    restart: unless-stopped
   backup-cockroach:
     image: hardcoreeng/backup
     extra_hosts:
diff --git a/dev/tool/package.json b/dev/tool/package.json
index 874f07948a6..d45ddf4cdbd 100644
--- a/dev/tool/package.json
+++ b/dev/tool/package.json
@@ -183,6 +183,6 @@
     "@hcengineering/api-client": "^0.7.3",
     "@faker-js/faker": "^8.4.1",
     "@hcengineering/hulylake-client": "^0.7.3",
-    "@hcengineering/communication-types": "^0.7.0"
+    "@hcengineering/communication-types": "^0.7.2"
   }
 }
diff --git a/dev/tool/src/communication.ts b/dev/tool/src/communication.ts
index 312095a7e76..f4dccf5f68e 100644
--- a/dev/tool/src/communication.ts
+++ b/dev/tool/src/communication.ts
@@ -319,6 +319,7 @@ async function oldMessageToNewMessageDoc (
     creator: oldMessage.creator,
     created: oldMessage.created.toISOString(),
     modified: oldMessage.edited?.toISOString() ?? null,
+    language: null,
     reactions,
     attachments,
     threads
diff --git a/models/communication/package.json b/models/communication/package.json
index a7fcc4dcc0b..7eadb595dad 100644
--- a/models/communication/package.json
+++ b/models/communication/package.json
@@ -37,7 +37,7 @@
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/communication": "^0.7.0",
     "@hcengineering/communication-resources": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/model": "^0.7.3",
diff --git a/packages/presentation/package.json b/packages/presentation/package.json
index 2273e19a94b..e5e6f6a3166 100644
--- a/packages/presentation/package.json
+++ b/packages/presentation/package.json
@@ -46,10 +46,10 @@
     "@hcengineering/client": "^0.7.3",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/collaborator-client": "^0.7.3",
-    "@hcengineering/communication-client-query": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
-    "@hcengineering/communication-shared": "^0.7.0",
+    "@hcengineering/communication-client-query": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-shared": "^0.7.2",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/diffview": "^0.7.0",
     "@hcengineering/notification": "^0.7.0",
diff --git a/plugins/activity-resources/package.json b/plugins/activity-resources/package.json
index 81545aaa8c5..8875604c40c 100644
--- a/plugins/activity-resources/package.json
+++ b/plugins/activity-resources/package.json
@@ -51,7 +51,7 @@
     "@hcengineering/ui": "^0.7.0",
     "@hcengineering/view": "^0.7.0",
     "@hcengineering/view-resources": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/emoji": "^0.7.0",
     "@hcengineering/emoji-resources": "^0.7.0",
     "svelte": "^4.2.20"
diff --git a/plugins/card-resources/package.json b/plugins/card-resources/package.json
index ca555b9881f..c56676f6b32 100644
--- a/plugins/card-resources/package.json
+++ b/plugins/card-resources/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@hcengineering/presence": "^0.7.0",
     "@hcengineering/presentation": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/communication-resources": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/ui": "^0.7.0",
diff --git a/plugins/chat-resources/package.json b/plugins/chat-resources/package.json
index e5b6a8404ba..3aaf0e364e6 100644
--- a/plugins/chat-resources/package.json
+++ b/plugins/chat-resources/package.json
@@ -42,7 +42,7 @@
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/card-resources": "^0.7.0",
     "@hcengineering/chat": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/communication": "^0.7.0",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/contact-resources": "^0.7.0",
@@ -55,7 +55,7 @@
     "@hcengineering/workbench": "^0.7.0",
     "@hcengineering/workbench-resources": "^0.7.0",
     "@hcengineering/communication-resources": "^0.7.0",
-    "@hcengineering/communication-shared": "^0.7.0",
+    "@hcengineering/communication-shared": "^0.7.2",
     "@hcengineering/rank": "^0.7.3",
     "@hcengineering/text": "^0.7.3",
     "@hcengineering/text-markdown": "^0.7.3",
diff --git a/plugins/client-resources/package.json b/plugins/client-resources/package.json
index cf8ca63a967..59eeaf76e69 100644
--- a/plugins/client-resources/package.json
+++ b/plugins/client-resources/package.json
@@ -40,8 +40,8 @@
   "dependencies": {
     "@hcengineering/analytics": "^0.7.3",
     "@hcengineering/client": "^0.7.3",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/platform": "^0.7.3",
     "@hcengineering/rpc": "^0.7.3",
diff --git a/plugins/communication-resources/package.json b/plugins/communication-resources/package.json
index ff8c28e1bfd..b6a691b9b96 100644
--- a/plugins/communication-resources/package.json
+++ b/plugins/communication-resources/package.json
@@ -49,8 +49,8 @@
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/chat": "^0.7.0",
     "@hcengineering/communication": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
-    "@hcengineering/communication-shared": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-shared": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/contact-resources": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
diff --git a/plugins/communication-resources/src/actions.ts b/plugins/communication-resources/src/actions.ts
index 55b5288e98e..b5b8eaf091d 100644
--- a/plugins/communication-resources/src/actions.ts
+++ b/plugins/communication-resources/src/actions.ts
@@ -43,7 +43,7 @@ import CreateCardFromMessagePopup from './components/CreateCardFromMessagePopup.
 
 import { isCardAllowedForCommunications, showForbidden, toggleReaction, toMarkup } from './utils'
 import {
-  isMessageTranslating,
+  isMessageManualTranslating,
   messageEditingStore,
   showOriginalMessagesStore,
   threadCreateMessageStore,
@@ -155,7 +155,7 @@ export const canReplyInThread: MessageActionVisibilityTester = (message: Message
 }
 
 export const translateMessage: MessageActionFunction = async (message: Message): Promise<void> => {
-  if (isMessageTranslating(message.cardId, message.id)) return
+  if (isMessageManualTranslating(message.cardId, message.id)) return
   const result = get(translateMessagesStore).find((it) => it.cardId === message.cardId && it.messageId === message.id)
 
   if (result != null) {
@@ -172,7 +172,8 @@ export const translateMessage: MessageActionFunction = async (message: Message):
 
   const markup = toMarkup(message.content)
   const lang = get(languageStore)
-  const response = message?.translates?.[lang] ?? (await aiTranslate(markup, lang))?.text
+  const currentTranslate = message?.translates?.[lang] ?? ''
+  const response = currentTranslate !== '' ? toMarkup(currentTranslate) : (await aiTranslate(markup, lang))?.text
 
   if (response !== undefined) {
     translateMessagesStore.update((store) => {
diff --git a/plugins/communication-resources/src/components/message/MessageBody.svelte b/plugins/communication-resources/src/components/message/MessageBody.svelte
index a78484eb3b7..d7951c5486d 100644
--- a/plugins/communication-resources/src/components/message/MessageBody.svelte
+++ b/plugins/communication-resources/src/components/message/MessageBody.svelte
@@ -14,9 +14,9 @@
 -->
 
 <script lang="ts">
-  import { PersonPreviewProvider, Avatar, translationStore } from '@hcengineering/contact-resources'
+  import { PersonPreviewProvider, Avatar } from '@hcengineering/contact-resources'
   import { formatName, Person } from '@hcengineering/contact'
-  import { CardID, Message, MessageID } from '@hcengineering/communication-types'
+  import { Message } from '@hcengineering/communication-types'
   import { Card } from '@hcengineering/card'
   import { Label } from '@hcengineering/ui'
 
@@ -28,7 +28,10 @@
     translateMessagesStore,
     messageEditingStore,
     TranslateMessagesStatus,
-    showOriginalMessagesStore
+    showOriginalMessagesStore,
+    isMessageTranslated,
+    translateToStore,
+    dontTranslateStore
   } from '../../stores'
   import { showOriginalMessage } from '../../actions'
 
@@ -52,35 +55,19 @@
     })
   }
 
-  let isTranslating = false
-  let translateStatus: TranslateMessagesStatus | undefined = undefined
-  let translateShown = false
+  let isManualTranslating = false
+  let manualTranslateStatus: TranslateMessagesStatus | undefined = undefined
+  let isTranslated = false
 
-  $: language = $translationStore?.enabled === true ? $translationStore?.translateTo : undefined
-  $: dontTranslate = $translationStore?.enabled === true ? $translationStore?.dontTranslate ?? [] : []
-
-  $: translateStatus = $translateMessagesStore.find((it) => it.cardId === card._id && it.messageId === message.id)
-  $: isTranslating = translateStatus?.inProgress === true
-  $: translateShown = isTranslateShown(message, translateStatus, language, $showOriginalMessagesStore, dontTranslate)
-
-  function isTranslateShown (
-    message: Message,
-    translateStatus?: TranslateMessagesStatus,
-    language?: string,
-    showOriginalMessages: Array<[CardID, MessageID]> = [],
-    dontTranslate: string[] = []
-  ): boolean {
-    const showOriginal = showOriginalMessages.some(([cId, mId]) => cId === card._id && mId === message.id)
-
-    if (showOriginal) return false
-    if (translateStatus?.result != null) return true
-    if (language == null || message.language === language) return false
-    if (message.language != null && dontTranslate.includes(message.language)) return false
-
-    const translate = message.translates?.[language]
-
-    return translate != null
-  }
+  $: manualTranslateStatus = $translateMessagesStore.find((it) => it.cardId === card._id && it.messageId === message.id)
+  $: isManualTranslating = manualTranslateStatus?.inProgress === true
+  $: isTranslated = isMessageTranslated(
+    message,
+    $translateToStore,
+    $dontTranslateStore,
+    $translateMessagesStore,
+    $showOriginalMessagesStore
+  )
 </script>
 
 {#if compact || hideHeader}
@@ -141,12 +128,12 @@
             (<Label label={communication.string.Edited} />)
           </div>
         {/if}
-        {#if isTranslating}
+        {#if isManualTranslating}
           <div class="message__translating">
             <Label label={communication.string.Translating} />
           </div>
         {/if}
-        {#if translateShown}
+        {#if isTranslated}
           <div class="message__show-original" on:click={() => showOriginalMessage(message, card)}>
             <Label label={communication.string.ShowOriginal} />
           </div>
diff --git a/plugins/communication-resources/src/components/message/MessageContentViewer.svelte b/plugins/communication-resources/src/components/message/MessageContentViewer.svelte
index 6c36c2e4740..2622a7c43e3 100644
--- a/plugins/communication-resources/src/components/message/MessageContentViewer.svelte
+++ b/plugins/communication-resources/src/components/message/MessageContentViewer.svelte
@@ -15,21 +15,22 @@
 
 <script lang="ts">
   import { MessageViewer as MarkupMessageViewer } from '@hcengineering/presentation'
-  import { CardID, Markdown, Message, MessageID } from '@hcengineering/communication-types'
+  import { Markdown, Message } from '@hcengineering/communication-types'
   import { Card } from '@hcengineering/card'
   import { Person } from '@hcengineering/contact'
   import { Markup } from '@hcengineering/core'
-  import { translationStore } from '@hcengineering/contact-resources'
   import { ShowMore } from '@hcengineering/ui'
 
   import ActivityMessageViewer from './ActivityMessageViewer.svelte'
   import { toMarkup } from '../../utils'
   import { isActivityMessage } from '../../activity'
   import {
-    isShownTranslatedMessage,
-    TranslateMessagesStatus,
+    isShownManualTranslatedMessage,
     translateMessagesStore,
-    showOriginalMessagesStore
+    showOriginalMessagesStore,
+    getMessageTranslation,
+    translateToStore,
+    dontTranslateStore
   } from '../../stores'
   import { translateMessage } from '../../actions'
 
@@ -43,37 +44,18 @@
   let displayMarkup: Markup = toMarkup(message.content)
   let prevContent: Markdown | undefined = undefined
 
-  $: language = $translationStore?.enabled === true ? $translationStore?.translateTo : undefined
-  $: dontTranslate = $translationStore?.enabled === true ? $translationStore?.dontTranslate : []
-  $: updateDisplayMarkup(message, $translateMessagesStore, $showOriginalMessagesStore, language, dontTranslate)
-
-  function updateDisplayMarkup (
-    message: Message,
-    translateMessages: TranslateMessagesStatus[],
-    showOriginalMessages: Array<[CardID, MessageID]>,
-    language?: string,
-    dontTranslate: string[] = []
-  ): void {
-    const translateResult = translateMessages.find((it) => it.cardId === card._id && it.messageId === message.id)
-    const showOriginal = showOriginalMessages.some(([cId, mId]) => cId === card._id && mId === message.id)
-    if (!showOriginal && translateResult?.result != null) {
-      displayMarkup = translateResult.result
-    } else if (
-      language != null &&
-      message.translates?.[language] != null &&
-      !showOriginal &&
-      !dontTranslate?.includes(language) &&
-      message.language !== language
-    ) {
-      displayMarkup = toMarkup(message.translates[language])
-    } else {
-      displayMarkup = toMarkup(message.content)
-    }
-  }
+  $: translatedMarkup = getMessageTranslation(
+    message,
+    $translateToStore,
+    $dontTranslateStore,
+    $translateMessagesStore,
+    $showOriginalMessagesStore
+  )
+  $: displayMarkup = translatedMarkup ?? toMarkup(message.content)
 
   $: if (prevContent !== message.content) {
     prevContent = message.content
-    if (isShownTranslatedMessage(message.cardId, message.id)) {
+    if (isShownManualTranslatedMessage(message.cardId, message.id)) {
       void translateMessage(message, card)
     } else {
       translateMessagesStore.update((store) => {
diff --git a/plugins/communication-resources/src/components/message/MessagePresenter.svelte b/plugins/communication-resources/src/components/message/MessagePresenter.svelte
index 7a3817363d5..73539a65554 100644
--- a/plugins/communication-resources/src/components/message/MessagePresenter.svelte
+++ b/plugins/communication-resources/src/components/message/MessagePresenter.svelte
@@ -15,10 +15,10 @@
 
 <script lang="ts">
   import { Person } from '@hcengineering/contact'
-  import { employeeByPersonIdStore, getPersonByPersonId, translationStore } from '@hcengineering/contact-resources'
+  import { employeeByPersonIdStore, getPersonByPersonId } from '@hcengineering/contact-resources'
   import { Card } from '@hcengineering/card'
   import { getEventPositionElement, showPopup, Action, Menu } from '@hcengineering/ui'
-  import type { CardID, MessageID, SocialID } from '@hcengineering/communication-types'
+  import type { SocialID } from '@hcengineering/communication-types'
   import { Message, MessageType } from '@hcengineering/communication-types'
   import { getResource } from '@hcengineering/platform'
   import { MessageAction } from '@hcengineering/communication'
@@ -29,10 +29,12 @@
   import OneRowMessageBody from './OneRowMessageBody.svelte'
   import {
     messageEditingStore,
-    TranslateMessagesStatus,
     translateMessagesStore,
     threadCreateMessageStore,
-    showOriginalMessagesStore
+    showOriginalMessagesStore,
+    isMessageTranslated,
+    translateToStore,
+    dontTranslateStore
   } from '../../stores'
   import { getMessageActions } from '../../actions'
   import communication from '../../plugin'
@@ -95,20 +97,18 @@
     return false
   }
 
-  $: language = $translationStore?.enabled === true ? $translationStore?.translateTo : undefined
-  $: dontTranslate = $translationStore?.enabled === true ? $translationStore?.dontTranslate : undefined
-
   let allActions: MessageAction[] = []
   let excludedActions: Ref<MessageAction>[] = []
   let actions: MessageAction[] = []
 
-  $: excludedActions = getExcludedActions(
-    $translateMessagesStore,
-    $showOriginalMessagesStore,
+  $: isTranslated = isMessageTranslated(
     message,
-    language,
-    dontTranslate
+    $translateToStore,
+    $dontTranslateStore,
+    $translateMessagesStore,
+    $showOriginalMessagesStore
   )
+  $: excludedActions = getExcludedActions(isTranslated)
 
   $: void getMessageActions(message).then((res) => {
     allActions = res
@@ -116,27 +116,12 @@
 
   $: actions = allActions.filter((it) => !excludedActions.includes(it._id))
 
-  function getExcludedActions (
-    translatedMessages: TranslateMessagesStatus[],
-    showOriginalMessage: Array<[CardID, MessageID]>,
-    message: Message,
-    lang?: string,
-    dontTranslate: string[] = []
-  ): Ref<MessageAction>[] {
-    const result: TranslateMessagesStatus | undefined = translatedMessages.find(
-      (it) => it.cardId === message.cardId && it.messageId === message.id
-    )
-    const showOriginal = showOriginalMessage.some(([cId, mId]) => cId === message.cardId && mId === message.id)
-    const isTranslated =
-      lang != null && message?.translates?.[lang] != null && !dontTranslate.includes(message.language ?? '')
-
-    if ((result === undefined && !isTranslated) || result?.inProgress || showOriginal) {
+  function getExcludedActions (isTranslated: boolean): Ref<MessageAction>[] {
+    if (!isTranslated) {
       return [communication.messageAction.ShowOriginalMessage]
-    } else if ((result?.result != null || isTranslated) && !showOriginal) {
+    } else {
       return [communication.messageAction.TranslateMessage]
     }
-
-    return []
   }
 
   function handleContextMenu (event: MouseEvent): void {
diff --git a/plugins/communication-resources/src/stores.ts b/plugins/communication-resources/src/stores.ts
index e6fc4cd2a42..000870f32de 100644
--- a/plugins/communication-resources/src/stores.ts
+++ b/plugins/communication-resources/src/stores.ts
@@ -11,13 +11,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { get, writable } from 'svelte/store'
+import { get, writable, derived } from 'svelte/store'
 import { createLabelsQuery, createQuery, onClient, onCommunicationClient } from '@hcengineering/presentation'
 import { type CardID, type Label, type LabelID, type Message, type MessageID } from '@hcengineering/communication-types'
 import core, { getCurrentAccount, type Markup, type Ref } from '@hcengineering/core'
 import { languageStore } from '@hcengineering/ui'
 import cardPlugin, { type Card } from '@hcengineering/card'
 import communication from '@hcengineering/communication'
+import { translationStore } from '@hcengineering/contact-resources'
+
+import { toMarkup } from './utils'
 
 export const labelsStore = writable<Label[]>([])
 export const messageEditingStore = writable<MessageID | undefined>(undefined)
@@ -26,6 +29,14 @@ export const showOriginalMessagesStore = writable<Array<[CardID, MessageID]>>([]
 export const threadCreateMessageStore = writable<Message | undefined>(undefined)
 export const guestCommunicationAllowedCards = writable<Array<Ref<Card>>>([])
 
+export const translateToStore = derived(translationStore, (translation) =>
+  translation?.enabled === true ? translation.translateTo : undefined
+)
+
+export const dontTranslateStore = derived(translationStore, (translation) =>
+  translation?.enabled === true ? translation.dontTranslate : []
+)
+
 export interface TranslateMessagesStatus {
   cardId: CardID
   messageId: MessageID
@@ -37,22 +48,69 @@ languageStore.subscribe(() => {
   translateMessagesStore.set([])
 })
 
-export function isMessageTranslated (cardId: CardID, messageId: MessageID): boolean {
+export function isMessageManualTranslated (cardId: CardID, messageId: MessageID): boolean {
   return get(translateMessagesStore).find((it) => it.cardId === cardId && messageId === it.messageId)?.result != null
 }
 
-export function isMessageTranslating (cardId: CardID, messageId: MessageID): boolean {
+export function isMessageManualTranslating (cardId: CardID, messageId: MessageID): boolean {
   return (
     get(translateMessagesStore).find((it) => it.cardId === cardId && messageId === it.messageId)?.inProgress === true
   )
 }
 
-export function isShownTranslatedMessage (cardId: CardID, messageId: MessageID): boolean {
+export function isShownManualTranslatedMessage (cardId: CardID, messageId: MessageID): boolean {
   const result = get(translateMessagesStore).find((it) => it.cardId === cardId && messageId === it.messageId)
   const showOriginal = get(showOriginalMessagesStore).some(([cId, mId]) => cId === cardId && mId === messageId)
   return !showOriginal && result?.result != null
 }
 
+export function isMessageTranslated (
+  message: Message,
+  translateTo: string | undefined,
+  dontTranslate: string[],
+  translatedMessages: TranslateMessagesStatus[],
+  showOriginalMessage: Array<[CardID, MessageID]>
+): boolean {
+  const showOriginal = showOriginalMessage.some(([cId, mId]) => cId === message.cardId && mId === message.id)
+  if (showOriginal) return false
+
+  const manualTranslate = translatedMessages.find((it) => it.cardId === message.cardId && it.messageId === message.id)
+  if (manualTranslate?.result != null) return true
+
+  const me = getCurrentAccount()
+  if (me.socialIds.includes(message.creator)) return false
+
+  if (translateTo == null || translateTo === '') return false
+  if (message.language != null && dontTranslate.includes(message.language)) return false
+  const res = (message.translates?.[translateTo] ?? '').trim()
+
+  return res !== ''
+}
+
+export function getMessageTranslation (
+  message: Message,
+  translateTo: string | undefined,
+  dontTranslate: string[],
+  translatedMessages: TranslateMessagesStatus[],
+  showOriginalMessage: Array<[CardID, MessageID]>
+): Markup | undefined {
+  const showOriginal = showOriginalMessage.some(([cId, mId]) => cId === message.cardId && mId === message.id)
+  if (showOriginal) return undefined
+
+  const manualTranslate = translatedMessages.find((it) => it.cardId === message.cardId && it.messageId === message.id)
+
+  if (manualTranslate?.result != null) return manualTranslate.result
+
+  const me = getCurrentAccount()
+  if (me.socialIds.includes(message.creator)) return undefined
+
+  if (translateTo == null || translateTo === '') return undefined
+  if (message.language != null && dontTranslate.includes(message.language)) return undefined
+  const res = (message.translates?.[translateTo] ?? '').trim()
+
+  return res !== '' ? toMarkup(res) : undefined
+}
+
 export function isCardSubscribed (cardId: Ref<Card>): boolean {
   const me = getCurrentAccount()
   const labelId = cardPlugin.label.Subscribed as string as LabelID
diff --git a/plugins/communication/package.json b/plugins/communication/package.json
index e9c6acc8cbf..e248a5a8e04 100644
--- a/plugins/communication/package.json
+++ b/plugins/communication/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@hcengineering/platform": "^0.7.3",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/ui": "^0.7.0",
diff --git a/plugins/contact-resources/src/translation.ts b/plugins/contact-resources/src/translation.ts
index 7f4d474934a..029153c39f4 100644
--- a/plugins/contact-resources/src/translation.ts
+++ b/plugins/contact-resources/src/translation.ts
@@ -21,22 +21,13 @@ export const languagesDisplayData: Record<string, { emoji: string, label: string
   bg: { emoji: '🇧🇬', label: 'Български' },
   ca: { emoji: '🇨🇦', label: 'Català' },
   zh: { emoji: '🇨🇳', label: '简体中文' },
-  'zh-TW': { emoji: '🇹🇼', label: '繁體中文' },
-  'zh-HK': { emoji: '🇭🇰', label: '繁體中文 (香港)' },
   cs: { emoji: '🇨🇿', label: 'Čeština' },
   da: { emoji: '🇩🇰', label: 'Dansk' },
   nl: { emoji: '🇳🇱', label: 'Nederlands' },
   en: { emoji: '🇺🇸', label: 'English' },
-  'en-US': { emoji: '🇺🇸', label: 'English (US)' },
-  'en-AU': { emoji: '🇦🇺', label: 'English (Australia)' },
-  'en-GB': { emoji: '🇬🇧', label: 'English (UK)' },
-  'en-NZ': { emoji: '🇳🇿', label: 'English (New Zealand)' },
-  'en-IN': { emoji: '🇮🇳', label: 'English (India)' },
   et: { emoji: '🇪🇪', label: 'Eesti' },
   fi: { emoji: '🇫🇮', label: 'Suomi' },
-  'nl-BE': { emoji: '🇧🇪', label: 'Vlaams' },
   fr: { emoji: '🇫🇷', label: 'Français' },
-  'fr-CA': { emoji: '🇨🇦', label: 'Français (Canada)' },
   de: { emoji: '🇩🇪', label: 'Deutsch' },
   'de-CH': { emoji: '🇨🇭', label: 'Schweizerdeutsch' },
   el: { emoji: '🇬🇷', label: 'Ελληνικά' },
@@ -52,13 +43,10 @@ export const languagesDisplayData: Record<string, { emoji: string, label: string
   no: { emoji: '🇳🇴', label: 'Norsk' },
   pl: { emoji: '🇵🇱', label: 'Polski' },
   pt: { emoji: '🇵🇹', label: 'Português' },
-  'pt-BR': { emoji: '🇧🇷', label: 'Português (Brasil)' },
-  'pt-PT': { emoji: '🇵🇹', label: 'Português (Portugal)' },
   ro: { emoji: '🇷🇴', label: 'Română' },
   ru: { emoji: '🇷🇺', label: 'Русский' },
   sk: { emoji: '🇸🇰', label: 'Slovenčina' },
   es: { emoji: '🇪🇸', label: 'Español' },
-  'es-419': { emoji: '🇲🇽', label: 'Español (Latinoamérica)' },
   sv: { emoji: '🇸🇪', label: 'Svenska' },
   th: { emoji: '🇹🇭', label: 'ไทย' },
   tr: { emoji: '🇹🇷', label: 'Türkçe' },
diff --git a/pods/fulltext/package.json b/pods/fulltext/package.json
index a86e6744940..c34a8461bab 100644
--- a/pods/fulltext/package.json
+++ b/pods/fulltext/package.json
@@ -76,8 +76,8 @@
     "@hcengineering/postgres": "^0.7.0",
     "@hcengineering/mongo": "^0.7.0",
     "@hcengineering/kafka": "^0.7.0",
-    "@hcengineering/communication-server": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
+    "@hcengineering/communication-server": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
     "@hcengineering/hulylake-client": "^0.7.3"
   }
 }
diff --git a/pods/media/package.json b/pods/media/package.json
index 71b0b8f1ffc..0b50e3bd838 100644
--- a/pods/media/package.json
+++ b/pods/media/package.json
@@ -64,8 +64,8 @@
     "@hcengineering/server-token": "^0.7.0",
     "@hcengineering/attachment": "^0.7.0",
     "@hcengineering/drive": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
     "dotenv": "~16.0.0",
     "kafkajs": "^2.2.4"
   }
diff --git a/pods/server/package.json b/pods/server/package.json
index 86df969fcd8..8a608e86d14 100644
--- a/pods/server/package.json
+++ b/pods/server/package.json
@@ -61,7 +61,7 @@
   "dependencies": {
     "@hcengineering/analytics": "^0.7.3",
     "@hcengineering/analytics-service": "^0.7.3",
-    "@hcengineering/communication-server": "^0.7.0",
+    "@hcengineering/communication-server": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/kafka": "^0.7.0",
diff --git a/server-plugins/activity-resources/package.json b/server-plugins/activity-resources/package.json
index b258b90f864..af15e0fba51 100644
--- a/server-plugins/activity-resources/package.json
+++ b/server-plugins/activity-resources/package.json
@@ -45,7 +45,7 @@
     "@hcengineering/server-core": "^0.7.0",
     "@hcengineering/server-notification-resources": "^0.7.0",
     "@hcengineering/text-core": "^0.7.3",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0"
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2"
   }
 }
diff --git a/server-plugins/card-resources/package.json b/server-plugins/card-resources/package.json
index 4b8a4609641..9e36d6d9b5f 100644
--- a/server-plugins/card-resources/package.json
+++ b/server-plugins/card-resources/package.json
@@ -43,8 +43,8 @@
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/platform": "^0.7.3",
     "@hcengineering/server-core": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
     "@hcengineering/communication": "^0.7.0",
     "@hcengineering/server-contact": "^0.7.0",
     "@hcengineering/contact": "^0.7.0"
diff --git a/server/indexer/package.json b/server/indexer/package.json
index 2f556f5da12..4ab92e0450c 100644
--- a/server/indexer/package.json
+++ b/server/indexer/package.json
@@ -49,10 +49,10 @@
     "@hcengineering/drive": "^0.7.0",
     "fast-equals": "^5.2.2",
     "@hcengineering/storage": "^0.7.3",
-    "@hcengineering/communication-rest-client": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-shared": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-rest-client": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-shared": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/hulylake-client": "^0.7.3"
   }
 }
diff --git a/server/server-pipeline/package.json b/server/server-pipeline/package.json
index b627c54a67b..73e69ffd1ab 100644
--- a/server/server-pipeline/package.json
+++ b/server/server-pipeline/package.json
@@ -179,8 +179,8 @@
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/mail": "^0.7.0",
     "@hcengineering/kafka": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
     "@hcengineering/communication": "^0.7.0",
     "@hcengineering/communication-assets": "^0.7.0"
   }
diff --git a/services/gmail/pod-gmail/package.json b/services/gmail/pod-gmail/package.json
index e6450e3ca70..164e9a2c139 100644
--- a/services/gmail/pod-gmail/package.json
+++ b/services/gmail/pod-gmail/package.json
@@ -64,8 +64,8 @@
     "@hcengineering/chat": "^0.7.0",
     "@hcengineering/client": "^0.7.3",
     "@hcengineering/client-resources": "^0.7.3",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-rest-client": "^0.7.0",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-rest-client": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/kvs-client": "^0.7.0",
     "@hcengineering/mail-common": "^0.7.0",
diff --git a/services/mail/mail-common/package.json b/services/mail/mail-common/package.json
index c9894854516..dd54d1214a7 100644
--- a/services/mail/mail-common/package.json
+++ b/services/mail/mail-common/package.json
@@ -50,10 +50,10 @@
     "@hcengineering/api-client": "^0.7.3",
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/chat": "^0.7.0",
-    "@hcengineering/communication-rest-client": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-shared": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-rest-client": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-shared": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/kafka": "^0.7.0",
diff --git a/services/mail/pod-mail-worker/package.json b/services/mail/pod-mail-worker/package.json
index 8395d3b1875..79c6cae8e5f 100644
--- a/services/mail/pod-mail-worker/package.json
+++ b/services/mail/pod-mail-worker/package.json
@@ -62,9 +62,9 @@
     "@hcengineering/api-client": "^0.7.3",
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/chat": "^0.7.0",
-    "@hcengineering/communication-rest-client": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-rest-client": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/kafka": "^0.7.0",
diff --git a/services/process/package.json b/services/process/package.json
index fe1e33f5b48..c9a0cb98244 100644
--- a/services/process/package.json
+++ b/services/process/package.json
@@ -65,8 +65,8 @@
     "@hcengineering/server-core": "^0.7.0",
     "@hcengineering/server-token": "^0.7.0",
     "@hcengineering/account-client": "^0.7.3",
-    "@hcengineering/communication-types": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
+    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
     "@temporalio/client": "1.12.3",
     "dotenv": "~16.0.0"
   }
diff --git a/services/translate/package.json b/services/translate/package.json
index 41d71fa3bba..a8dd96409cb 100644
--- a/services/translate/package.json
+++ b/services/translate/package.json
@@ -57,9 +57,9 @@
     "@hcengineering/analytics-service": "^0.7.3",
     "@hcengineering/api-client": "^0.7.3",
     "@hcengineering/card": "^0.7.0",
-    "@hcengineering/communication-sdk-types": "^0.7.0",
-    "@hcengineering/communication-shared": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.0",
+    "@hcengineering/communication-sdk-types": "^0.7.2",
+    "@hcengineering/communication-shared": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.2",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/hulylake-client": "^0.7.3",
diff --git a/services/translate/src/conroller.ts b/services/translate/src/conroller.ts
index 49c7b1190bf..4085d5bc5ce 100644
--- a/services/translate/src/conroller.ts
+++ b/services/translate/src/conroller.ts
@@ -34,7 +34,7 @@ import { withRetry } from '@hcengineering/retry'
 import { Analytics } from '@hcengineering/analytics'
 import OpenAI from 'openai'
 import { PlatformQueue } from '@hcengineering/server-core'
-import { MessageEventType, TranslateMessageEvent } from '@hcengineering/communication-sdk-types'
+import { MessageEventType, TranslateMessageEvent, UpdatePatchEvent } from '@hcengineering/communication-sdk-types'
 
 import { Storage } from './storage'
 import config from './config'
@@ -52,12 +52,12 @@ export class Controller {
     this.storage = new Storage(this.ctx)
   }
 
-  public processTx (workspace: WorkspaceUuid, tx: Tx): void {
+  public processTranslationSettingsTx (workspace: WorkspaceUuid, tx: Tx): void {
     if (!this.languagesByWorkspace.has(workspace)) return
-    this.processTranslation(workspace, tx)
+    this.processTranslationSettings(workspace, tx)
   }
 
-  private processTranslation (workspace: WorkspaceUuid, tx: Tx): void {
+  private processTranslationSettings (workspace: WorkspaceUuid, tx: Tx): void {
     if (tx._class === core.class.TxCreateDoc) {
       const createTx = tx as TxCreateDoc<Doc>
       if (createTx.objectClass !== contact.class.Translation) return
@@ -111,28 +111,56 @@ export class Controller {
     return arrayLangs
   }
 
+  private getUpdateLanguageTx (cardId: CardID, messageId: MessageID, language: string): TxDomainEvent {
+    const event: UpdatePatchEvent = {
+      type: MessageEventType.UpdatePatch,
+      cardId,
+      messageId,
+      language,
+      socialId: core.account.System
+    }
+
+    return {
+      _id: generateId(),
+      _class: core.class.TxDomainEvent,
+      space: core.space.Tx,
+      objectSpace: core.space.Workspace,
+      modifiedOn: Date.now(),
+      modifiedBy: core.account.System,
+      domain: 'communication' as Domain,
+      event
+    }
+  }
+
   async processMessageCreate (
     ctx: MeasureContext,
     workspace: WorkspaceUuid,
     message: Message,
     blobId: BlobID
   ): Promise<void> {
-    const translateTo = (await this.getLanguages(workspace)).filter((it) => it !== message.language)
+    const initialLanguage = message.language
+    const translateTo = await this.getLanguages(workspace)
     if (translateTo.length === 0) return
-    console.log('translateTo', translateTo)
-    console.log('message', message.content, message.language)
 
+    let originalLanguage = initialLanguage
+
+    const txes: Tx[] = []
     for (const lang of translateTo) {
       try {
         const result = await withRetry(() => this.translate(message.content, lang))
+        if (result == null) continue
+        const translation = result?.translation ?? ''
 
-        if (result !== '') {
-          await this.storage.insertMessage(workspace, message.cardId, blobId, lang, message, result)
+        if (result?.original_language != null && result.original_language !== '') {
+          originalLanguage = result.original_language
+        }
+        if (translation !== '') {
+          await this.storage.insertMessage(workspace, message.cardId, blobId, lang, message, translation)
           const event: TranslateMessageEvent = {
             type: MessageEventType.TranslateMessage,
             cardId: message.cardId,
             messageId: message.id,
-            content: result,
+            content: translation,
             language: lang
           }
 
@@ -146,14 +174,24 @@ export class Controller {
             domain: 'communication' as Domain,
             event
           }
-          const client = await this.getRestClient(workspace)
-          await client.tx(tx)
+          txes.push(tx)
         }
       } catch (e) {
         ctx.error('Failed to translate message', { error: e, messageId: message.id })
         Analytics.handleError(e as Error)
       }
     }
+
+    if (originalLanguage != null && originalLanguage !== '' && originalLanguage !== initialLanguage) {
+      txes.unshift(this.getUpdateLanguageTx(message.cardId, message.id, originalLanguage))
+    }
+
+    if (txes.length > 0) {
+      const client = await this.getRestClient(workspace)
+      for (const tx of txes) {
+        await client.tx(tx)
+      }
+    }
   }
 
   async processMessageUpdate (
@@ -162,22 +200,30 @@ export class Controller {
     cardId: CardID,
     messageId: MessageID,
     content: Markdown,
-    blobId: BlobID
+    blobId: BlobID,
+    language?: string
   ): Promise<void> {
     const translateTo = await this.getLanguages(workspace)
     if (translateTo.length === 0) return
+    const txes: Tx[] = []
+
+    let originalLanguage = language
 
     for (const lang of translateTo) {
       try {
         const result = await withRetry(() => this.translate(content, lang))
-
-        if (result !== '') {
-          await this.storage.updateMessage(workspace, cardId, blobId, messageId, lang, result)
+        if (result == null) continue
+        const translation = result?.translation ?? ''
+        if (result?.original_language != null && result.original_language !== '') {
+          originalLanguage = result.original_language
+        }
+        if (translation !== '') {
+          await this.storage.updateMessage(workspace, cardId, blobId, messageId, lang, translation)
           const event: TranslateMessageEvent = {
             type: MessageEventType.TranslateMessage,
             cardId,
             messageId,
-            content: result,
+            content: translation,
             language: lang
           }
           const tx: TxDomainEvent = {
@@ -190,14 +236,25 @@ export class Controller {
             domain: 'communication' as Domain,
             event
           }
-          const client = await this.getRestClient(workspace)
-          await client.tx(tx)
+
+          txes.push(tx)
         }
       } catch (e) {
         ctx.error('Failed to update message translation', { error: e, messageId })
         Analytics.handleError(e as Error)
       }
     }
+
+    if (originalLanguage != null && originalLanguage !== '' && originalLanguage !== language) {
+      txes.unshift(this.getUpdateLanguageTx(cardId, messageId, originalLanguage))
+    }
+
+    if (txes.length > 0) {
+      const client = await this.getRestClient(workspace)
+      for (const tx of txes) {
+        await client.tx(tx)
+      }
+    }
   }
 
   async processMessageRemove (
@@ -220,14 +277,28 @@ export class Controller {
     }
   }
 
-  private async translate (markdown: string, lang: string): Promise<string> {
+  private async translate (
+    markdown: string,
+    lang: string
+  ): Promise<{ original_language?: string, translation?: string } | undefined> {
+    const systemPropmpt = `You are a translation model. 
+You are a translation model. Your only task is to translate the given markdown text into the ${lang} language.
+Detect the original language of the input.
+If the input markdown is already written in ${lang}, do not translate. Preserve names and terms if they have no clear equivalent.
+ Be as literal and accurate as possible while keeping the meaning natural. Keep markdown structire.
+Output the result strictly as a JSON object in the following format:
+{
+  "original_language": "<detected language in iso 639-1>",
+  "translation": "<translated markdown or empty string if no translation was needed>"
+}
+Do not add any explanations, comments, or extra text outside the JSON.`
+
     const response = await this.openai.chat.completions.create({
       model: config.OpenAIModel,
       messages: [
         {
           role: 'system',
-          content: `You are a translation model.Your only task is to translate the given markdown text into the ${lang} language.
-Output only the translation, nothing else. Do not add explanations, comments, or formatting.Preserve names and terms if they have no clear equivalent. Be as literal and accurate as possible while keeping the meaning natural.`
+          content: systemPropmpt
         },
         {
           role: 'user',
@@ -236,6 +307,18 @@ Output only the translation, nothing else. Do not add explanations, comments, or
       ]
     })
 
-    return response.choices[0].message.content ?? ''
+    const res = response.choices[0].message.content ?? ''
+
+    try {
+      const parsed = JSON.parse(res)
+      if (typeof parsed !== 'object' || parsed === null) {
+        console.log('Failed to parse translation response', { response: res })
+        return undefined
+      }
+      return parsed
+    } catch (e) {
+      console.log('Failed to parse translation response', { response: res, error: e })
+      return undefined
+    }
   }
 }
diff --git a/services/translate/src/index.ts b/services/translate/src/index.ts
index 48dd7249c6f..34397c2e4db 100644
--- a/services/translate/src/index.ts
+++ b/services/translate/src/index.ts
@@ -61,7 +61,7 @@ async function main (): Promise<void> {
     const ws = queueMessage.workspace
     const tx = queueMessage.value
 
-    controller.processTx(ws, tx)
+    controller.processTranslationSettingsTx(ws, tx)
 
     const createMessageData = extractCreateMessageData(tx)
     const updateMessageData = extractUpdateMessageData(tx)