diff --git a/src/components/CscMainMenuTop.vue b/src/components/CscMainMenuTop.vue
index d4039cc3..518ef8c2 100644
--- a/src/components/CscMainMenuTop.vue
+++ b/src/components/CscMainMenuTop.vue
@@ -91,7 +91,7 @@ export default {
                     to: '/user/conversations',
                     icon: 'question_answer',
                     label: this.$t('Conversations'),
-                    sublabel: this.$t('Calls, Faxes, VoiceMails'),
+                    sublabel: this.isFaxFeatureEnabled ? this.$t('Calls, Faxes, VoiceMails') : this.$t('Calls, VoiceMails'),
                     visible: this.hasSubscriberProfileAttribute(PROFILE_ATTRIBUTE_MAP.conversations)
                 },
                 {
diff --git a/src/components/pages/Conversations/CscCallItem.vue b/src/components/pages/Conversations/CscCallItem.vue
index dc9ab1d5..ae97f961 100644
--- a/src/components/pages/Conversations/CscCallItem.vue
+++ b/src/components/pages/Conversations/CscCallItem.vue
@@ -34,7 +34,7 @@
                 caption
             >
                 <span>
-                    {{ $t('Cost') }}
+                    {{ $t('Cost') + ": " }}
                 </span>
                 <span>
                     {{ $filters.wholeCurrency(totalCustomerCostRounded) }}
diff --git a/src/i18n/de.json b/src/i18n/de.json
index e9a41965..a2ee9747 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -93,6 +93,7 @@
     "Calling {number}...": "{number} wird angerufen …",
     "Calls": "Anrufe",
     "Calls, Faxes, VoiceMails": "Anrufe, Faxe, Sprachnachrichten",
+    "Calls, VoiceMails": "Anrufe, Sprachnachrichten",
     "Cancel": "Abbrechen",
     "Cancel Mode": "Modus zum Abbrechen",
     "Cdr": "Cdr",
@@ -333,6 +334,7 @@
     "New password retyped": "Neues Passwort wiederholt",
     "No": "Nein",
     "No Calls found": "Keine Anrufe gefunden",
+    "No Calls or Voicemails found": "Keine Anrufe oder Voicemails gefunden",
     "No Calls, Voicemails or Faxes found": "Keine Anrufe, Voicemails oder Faxe gefunden",
     "No Faxes found": "Keine Faxe gefunden",
     "No Voicemails found": "Keine Voicemails gefunden",
@@ -708,4 +710,4 @@
     "{field} must consist of numeric characters only": "{field} darf nur Zahlen enthalten.",
     "{field} must consist only of numeric characters or the symbols +, * or #.": "{field} darf nur aus Zahlen oder den Symbolen +, * oder # bestehen.",
     "{field} must have at most {maxLength} letters": "{field} darf maximal {maxLength} Buchstaben enthalten."
-}
\ No newline at end of file
+}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index a4b8e711..29ab9593 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -44,10 +44,10 @@
     "Allow mail2fax emails only to this IP (the IP or hostname is present in the \\\"Received\\\" header).": "Allow mail2fax emails only to this IP (the IP or hostname is present in the \\\"Received\\\" header).",
     "Allowed extensions are between {min} and {max}": "Allowed extensions are between {min} and {max}",
     "Always": "Always",
-    "An error occured while trying to assign the speed dial slot. Please try again": "An error occured while trying to assign the speed dial slot. Please try again",
-    "An error occured while trying to load the speed dials. Please try again": "An error occured while trying to load the speed dials. Please try again",
-    "An error occured while trying to send the fax. Please try again": "An error occured while trying to send the fax. Please try again",
-    "An error occured while trying to unassign the speed dial slot. Please try again": "An error occured while trying to unassign the speed dial slot. Please try again",
+    "An error occurred while trying to assign the speed dial slot. Please try again": "An error occurred while trying to assign the speed dial slot. Please try again",
+    "An error occurred while trying to load the speed dials. Please try again": "An error occurred while trying to load the speed dials. Please try again",
+    "An error occurred while trying to send the fax. Please try again": "An error occurred while trying to send the fax. Please try again",
+    "An error occurred while trying to unassign the speed dial slot. Please try again": "An error occurred while trying to unassign the speed dial slot. Please try again",
     "An error occurred:": "An error occurred:",
     "Apps": "Apps",
     "April": "April",
@@ -92,6 +92,7 @@
     "Calling {number}...": "Calling {number}...",
     "Calls": "Calls",
     "Calls, Faxes, VoiceMails": "Calls, Faxes, VoiceMails",
+    "Calls, VoiceMails": "Calls, VoiceMails",
     "Cancel": "Cancel",
     "Cancel Mode": "Cancel Mode",
     "Cdr": "Cdr",
@@ -321,6 +322,7 @@
     "New password retyped": "New password retyped",
     "No": "No",
     "No Calls found": "No Calls found",
+    "No Calls or Voicemails found": "No Calls or Voicemails found",
     "No Calls, Voicemails or Faxes found": "No Calls, Voicemails or Faxes found",
     "No Faxes found": "No Faxes found",
     "No Voicemails found": "No Voicemails found",
@@ -688,4 +690,4 @@
     "{field} must consist of numeric characters only": "{field} must consist of numeric characters only",
     "{field} must consist only of numeric characters or the symbols +, * or #.": "{field} must consist only of numeric characters or the symbols +, * or #.",
     "{field} must have at most {maxLength} letters": "{field} must have at most {maxLength} letters"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 7079661b..520aea32 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -92,7 +92,8 @@
     "Calling Card": "Tarjeta de llamada",
     "Calling {number}...": "Iniciando ...",
     "Calls": "Llamadas",
-    "Calls, Faxes, VoiceMails": "Llamadas, faxes, correos de voz",
+    "Calls, Faxes, VoiceMails": "Llamadas, faxes, mensajes de voz",
+    "Calls, VoiceMails": "Llamadas, mensajes de voz",
     "Cancel": "Cancelar",
     "Cancel Mode": "Modo de cancelación",
     "Cdr": "Cdr",
@@ -334,7 +335,8 @@
     "New password retyped": "Nueva contraseña reescrita",
     "No": "No",
     "No Calls found": "No se encontraron llamadas",
-    "No Calls, Voicemails or Faxes found": "No se encontraron llamadas, correos de voz o faxes",
+    "No Calls or Voicemails found": "No se encontraron llamadas o mensajes de voz",
+    "No Calls, Voicemails or Faxes found": "No se encontraron llamadas, mensajes de voz o faxes",
     "No Faxes found": "No se encontraron faxes",
     "No Voicemails found": "No se encontraron mensajes de voz",
     "No call queues created yet": "Aún no se han creado colas de llamadas",
@@ -711,4 +713,4 @@
     "{field} must consist of numeric characters only": "El campo {field} debe constar sólo de caracteres numéricos",
     "{field} must consist only of numeric characters or the symbols +, * or #.": "El campo {field} debe consistir únicamente en caracteres numéricos o los símbolos +, * o #.",
     "{field} must have at most {maxLength} letters": "El campo {field} debe tener como máximo {maxLength} letras"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index dce24ab9..73dae020 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -93,6 +93,7 @@
     "Calling {number}...": "Appel en cours de {number}...",
     "Calls": "Appels",
     "Calls, Faxes, VoiceMails": "Appels, télécopies, messages vocaux",
+    "Calls, VoiceMails": "Appels, messages vocaux",
     "Cancel": "Annuler",
     "Cancel Mode": "Mode annuler",
     "Cdr": "Cdr",
@@ -333,7 +334,8 @@
     "New password retyped": "Nouveau mot de passe saisi à nouveau",
     "No": "Non",
     "No Calls found": "Aucun appel trouvé",
-    "No Calls, Voicemails or Faxes found": "Pas d'appels, de messages vocaux ou de fax trouvés",
+    "No Calls or Voicemails found": "Aucun appel ni message vocal",
+    "No Calls, Voicemails or Faxes found": "Aucun appel, message vocal ni fax trouvé",
     "No Faxes found": "Aucun fax trouvé",
     "No Voicemails found": "Aucun message vocal trouvé",
     "No call queues created yet": "Aucune file d'attente n'a encore été créée",
@@ -707,4 +709,4 @@
     "{field} must consist of numeric characters only": "{field} ne peut contenir que des caractères numériques",
     "{field} must consist only of numeric characters or the symbols +, * or #.": "Le champ {field} doit contenir uniquement des caractères numériques ou les symboles +, * ou #.",
     "{field} must have at most {maxLength} letters": "{field} doit avoir au maximum {maxLength} caractères"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 1291c60a..ce63c2ca 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -91,6 +91,7 @@
     "Calling {number}...": "Chiamata in corso a {number}...",
     "Calls": "Chiamate",
     "Calls, Faxes, VoiceMails": "Chiamate, Fax, Messaggi Vocali",
+    "Calls, VoiceMails": "Chiamate, Messaggi Vocali",
     "Cancel": "Annulla",
     "Cancel Mode": "Cancel Mode",
     "Cdr": "Cdr",
@@ -326,6 +327,7 @@
     "New password retyped": "Ripeti la nuova password",
     "No": "No",
     "No Calls found": "Non è stata trovata alcuna chiamata",
+    "No Calls or Voicemails found": "Non sono stati trovati chiamate né messaggi vocali",
     "No Calls, Voicemails or Faxes found": "Non sono stati trovati chiamate, messaggi vocali né fax",
     "No Faxes found": "Non è stato trovato alcun fax",
     "No Voicemails found": "Non è stato trovato alcun messaggio vocale",
@@ -696,4 +698,4 @@
     "{field} must consist of numeric characters only": "Il campo {field} deve contenere solo caratteri numerici",
     "{field} must consist only of numeric characters or the symbols +, * or #.": "{field} deve contenere solo caratteri numerici o i simboli +, * o #.",
     "{field} must have at most {maxLength} letters": "Il campo {field} può contenere al massimo {maxLength} lettere"
-}
\ No newline at end of file
+}
diff --git a/src/pages/CscPageConversations.vue b/src/pages/CscPageConversations.vue
index 0b3af056..5ed5e895 100644
--- a/src/pages/CscPageConversations.vue
+++ b/src/pages/CscPageConversations.vue
@@ -215,6 +215,9 @@ export default {
         },
         noResultsMessage () {
             if (this.selectedTab === 'call-fax-voicemail') {
+                if (!this.isFaxFeatureEnabled) {
+                    return this.$t('No Calls or Voicemails found')
+                }
                 return this.$t('No Calls, Voicemails or Faxes found')
             } else if (this.selectedTab === 'call') {
                 return this.$t('No Calls found')