diff --git a/i18n/en-US.json b/i18n/en-US.json
index 6de8f30..a945981 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -1213,6 +1213,15 @@
 				"configurable": {
 					"label": "Configurable via Menu?",
 					"help": " If unchecked, it will disallow the user to configure voicemail via the menu"
+				},
+				"__comment": "UI-2634: add support for wav/mp4/mp3 for voicemail media extensions",
+				"__version": "4.1",
+				"mediaExtension": {
+					"label": "Media Extension",
+					"mp3": "mp3",
+					"mp4": "mp4",
+					"wav": "wav",
+					"default": "Account Default"
 				}
 			},
 			"recipients": {
diff --git a/submodules/vmboxes/vmboxes.js b/submodules/vmboxes/vmboxes.js
index cd701c6..12ba2bf 100644
--- a/submodules/vmboxes/vmboxes.js
+++ b/submodules/vmboxes/vmboxes.js
@@ -357,6 +357,10 @@ define(function(require){
 				delete mergedData.media.unavailable;
 			}
 
+			if (mergedData.media_extension && mergedData.media_extension === 'default') {
+				delete mergedData.media_extension;
+			}
+
 			delete mergedData.extra;
 
 			return mergedData;
diff --git a/views/vmboxes-edit.html b/views/vmboxes-edit.html
index 42bcc51..a3be14e 100644
--- a/views/vmboxes-edit.html
+++ b/views/vmboxes-edit.html
@@ -66,6 +66,20 @@
 					</div>
 				</div>
 
+				<div class="control-group">
+					<label class="control-label" for="timezone">{{ i18n.vmboxes.popupSettings.options.mediaExtension.label }}</label>
+					<div class="controls">
+						<select name="media_extension" id="media_extension">
+							{{#select media_extension}}
+								<option value="default">{{ i18n.vmboxes.popupSettings.options.mediaExtension.default }}</option>
+								<option value="mp3">{{ i18n.vmboxes.popupSettings.options.mediaExtension.mp3 }}</option>
+								<!-- <option value="mp4">{{ i18n.callflows.vmbox.mp4 }}</option> -->
+								<option value="wav">{{ i18n.vmboxes.popupSettings.options.mediaExtension.wav }}</option>
+							{{/select}}
+						</select>
+					</div>
+				</div>
+
 				<div class="control-group">
 					<label class="control-input checkbox">
 						<div data-toggle="tooltip" data-placement="right" data-original-title="{{ i18n.vmboxes.popupSettings.options.alreadySetup.help }}">