diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 615e9cac11..08176b2b0e 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -147,7 +147,7 @@ require_once "resources/check_auth.php";
 	require_once "resources/header.php";
 
 //begin the content
-	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
 	echo "			<b>".$text['title']."</b>";
@@ -162,11 +162,11 @@ require_once "resources/check_auth.php";
 	if (permission_exists('recording_upload')) {
 		echo "<b>".$text['header']."</b>";
 		echo "<br><br>";
-		echo "<form action=\"\" method=\"POST\" enctype=\"multipart/form-data\" name=\"frmUpload\" onSubmit=\"\">\n";
-		echo "<input name=\"type\" type=\"hidden\" value=\"rec\">\n";
+		echo "<form action='' method='post' enctype='multipart/form-data' name='frmUpload'>\n";
+		echo "<input name='type' type='hidden' value='rec'>\n";
 		echo "".$text['label-upload']."\n";
-		echo "<input name=\"ulfile\" type=\"file\" class=\"formfld fileinput\" style=\"width: 260px;\" id=\"ulfile\">\n";
-		echo "<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
+		echo "<input name='ulfile' type='file' class='formfld fileinput' style='width: 260px;' id='ulfile'>\n";
+		echo "<input name='submit' type='submit'  class='btn' id='upload' value=\"".$text['button-upload']."\">\n";
 		echo "</form>";
 		echo "<br><br>\n";
 	}
@@ -206,16 +206,20 @@ require_once "resources/check_auth.php";
 	echo "<tr>\n";
 	echo th_order_by('recording_name', $text['label-recording_name'], $order_by, $order);
 	echo th_order_by('recording_filename', $text['label-file_name'], $order_by, $order);
-	echo "<th class=\"listhdr\" nowrap>".$text['label-tools']."</th>\n";
-	echo "<th class=\"listhdr\" style='text-align: center;' nowrap>".$text['label-file-size']."</th>\n";
+	echo "<th class='listhdr' nowrap>".$text['label-tools']."</th>\n";
+	if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
+		echo "<th class='listhdr' style='text-align: center;' nowrap>".$text['label-file-size']."</th>\n";
+	}
 	echo th_order_by('recording_description', $text['label-description'], $order_by, $order);
 	echo "<td class='list_control_icons'>&nbsp;</td>\n";
 	echo "</tr>\n";
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
-			$tmp_filesize = filesize($_SESSION['switch']['recordings']['dir'].'/'.$row['recording_filename']);
-			$tmp_filesize = byte_convert($tmp_filesize);
+			if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
+				$tmp_filesize = filesize($_SESSION['switch']['recordings']['dir'].'/'.$row['recording_filename']);
+				$tmp_filesize = byte_convert($tmp_filesize);
+			}
 
 			//playback progress bar
 			echo "<tr id='recording_progress_bar_".$row['recording_uuid']."' style='display: none;'><td colspan='5'><span class='playback_progress_bar' id='recording_progress_".$row['recording_uuid']."'></span></td></tr>\n";
@@ -249,7 +253,9 @@ require_once "resources/check_auth.php";
 				echo "&nbsp;";
 			}
 			echo "	</td>\n";
-			echo "	<td class='".$row_style[$c]."' style='text-align: center;'>".$tmp_filesize."</td>\n";
+			if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
+				echo "	<td class='".$row_style[$c]."' style='text-align: center;'>".$tmp_filesize."</td>\n";
+			}
 			echo "	<td valign='top' class='row_stylebg' width='30%'>".$row['recording_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons'>";
 			if (permission_exists('recording_edit')) {
diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index a5bf8cae47..8b965e2150 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -107,7 +107,9 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
 			$table_header .= th_order_by('caller_id_number', $text['label-caller_id_number'], $order_by, $order);
 			$table_header .= "<th>".$text['label-tools']."</th>\n";
 			$table_header .= th_order_by('message_length', $text['label-message_length'], $order_by, $order, null, "style='text-align: right;'");
-			$table_header .= "<th style='text-align: right;'>".$text['label-message_size']."</th>\n";
+			if ($_SESSION['voicemail']['storage_type']['text'] != 'base64') {
+				$table_header .= "<th style='text-align: right;'>".$text['label-message_size']."</th>\n";
+			}
 			$table_header .= "<td style='width: 25px;'>&nbsp;</td>";
 			$table_header .= "</tr>\n";
 
@@ -121,14 +123,15 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
 				echo "	<td colspan='3' align='left' valign='top'>\n";
 				echo "		<b>".$text['label-mailbox'].": ".$field['voicemail_id']." </b><br />&nbsp;\n";
 				echo "	</td>\n";
-				echo "	<td colspan='3' valign='bottom' align='right'>\n";
+				echo "	<td colspan='".(($_SESSION['voicemail']['storage_type']['text'] != 'base64') ? 3 : 2)."' valign='bottom' align='right'>\n";
 				if (permission_exists('voicemail_greeting_view')) {
 					echo "		<input type='button' class='btn' name='' alt='greetings' onclick=\"window.location='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$field['voicemail_id']."'\" value='".$text['button-greetings']."'>\n";
 				}
 				if (permission_exists('voicemail_edit')) {
 					echo "		<input type='button' class='btn' name='' alt='settings' onclick=\"window.location='".PROJECT_PATH."/app/voicemails/voicemail_edit.php?id=".$field['voicemail_uuid']."'\" value='".$text['button-settings']."'>\n";
 				}
-				echo "	<br /><br /></td>\n";
+				echo "		<br /><br />";
+				echo "	</td>\n";
 				echo "	<td>&nbsp;</td>\n";
 				echo "</tr>\n";
 				if (count($field['messages']) > 0) {
@@ -161,7 +164,9 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
 						echo "<a href=\"voicemail_messages.php?action=download&type=vm&t=bin&id=".$row['voicemail_id']."&voicemail_uuid=".$row['voicemail_uuid']."&uuid=".$row['voicemail_message_uuid']."\" title='".$text['label-download']."'>".$v_link_label_download."</a>";
 					echo "	</td>\n";
 					echo "	<td valign='top' class='".$row_style[$c]."' style=\"".$style." text-align: right;\">".$row['message_length_label']."&nbsp;</td>\n";
-					echo "	<td valign='top' class='".$row_style[$c]."' style=\"".$style." text-align: right;\" nowrap='nowrap'>".$row['file_size_label']."</td>\n";
+					if ($_SESSION['voicemail']['storage_type']['text'] != 'base64') {
+						echo "	<td valign='top' class='".$row_style[$c]."' style=\"".$style." text-align: right;\" nowrap='nowrap'>".$row['file_size_label']."</td>\n";
+					}
 					echo "	<td class='list_control_icon' style='width: 25px;'>";
 					if (permission_exists('voicemail_message_delete')) {
 						echo 	"<a href='voicemail_message_delete.php?voicemail_uuid=".$row['voicemail_uuid']."&id=".$row['voicemail_message_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";