diff --git a/OpenVBX/controllers/messages/inbox.php b/OpenVBX/controllers/messages/inbox.php
index dc5d840b..3e76dfac 100644
--- a/OpenVBX/controllers/messages/inbox.php
+++ b/OpenVBX/controllers/messages/inbox.php
@@ -145,6 +145,7 @@ public function scripts($group = false)
 				'original_called' => $item->called,
 				'original_caller' => $item->caller,
 				'owner_type' => $item->owner_type,
+				'sid' => $item->call_sid,
 			);
 
 		}
@@ -310,6 +311,7 @@ private function inbox($group = false)
 								 'original_called' => $item->called,
 								 'original_caller' => $item->caller,
 								 'owner_type' => $item->owner_type,
+								 'sid' => $item->call_sid,
 								 );
 
 			}
diff --git a/OpenVBX/views/messages/details.php b/OpenVBX/views/messages/details.php
index 6cc27c7c..5c70b410 100644
--- a/OpenVBX/views/messages/details.php
+++ b/OpenVBX/views/messages/details.php
@@ -124,6 +124,43 @@
 			<h3>Transcription</h3>
 			<?php endif; ?>
 			<div class="message-transcript"><?php echo (is_null($message->content_text) ? "(no transcription)" : $message->content_text) ?></div>
+			<?php if(substr($message->call_sid,0,2) == 'MM'):
+				echo "<br><br><h3>Media Attachements</h3>";
+				
+				$ci = & get_instance();
+				
+				require_once(APPPATH . 'libraries/twilio.php');
+				
+				$ci->twilio = new TwilioRestClient($ci->twilio_sid,$ci->twilio_token,$ci->twilio_endpoint);
+				
+				$media_url = "Accounts/{$this->twilio_sid}/Messages/{$message->call_sid}/Media.xml";
+				
+				$mediaObj = $ci->twilio->request($media_url, "GET");
+				
+				$media_xml = $mediaObj->ResponseXml;
+				
+				foreach($media_xml->MediaList->Media as $media):
+				
+					$media_uri = 'https://api.twilio.com/2010-04-01/Accounts/'.$this->twilio_sid.'/Messages/'.$message->call_sid.'/Media/'.$media->Sid;
+					
+					if(strpos($media->ContentType,'image')!==false):
+						echo '<img src="'.$media_uri.'" type="'.$media->ContentType.'">';
+					elseif(strpos($media->ContentType,'audio')!==false):
+						echo '<audio controls>';
+						echo '<source src="'.$media_uri.'" type="'.$media->ContentType.'">';
+						echo 'Your browser does not support the audio element.</audio>';
+					elseif(strpos($media->ContentType,'video')!==false):
+						echo '<video controls>';
+						echo '<source src="'.$media_uri.'" type="'.$media->ContentType.'">';
+						echo 'Your browser does not support the video element.</video>';
+					endif;
+					
+					echo '<br>'.$media->ContentType.': <a href="'.$media_uri.'">Click To Download</a>';
+					echo '<br><br>';
+					
+				endforeach;
+	
+			endif; ?>
 		</div><!-- .message-details-transcript -->
 
 	</div><!-- .vbx-content-container -->
diff --git a/OpenVBX/views/messages/inbox.php b/OpenVBX/views/messages/inbox.php
index 7819d831..538764f0 100644
--- a/OpenVBX/views/messages/inbox.php
+++ b/OpenVBX/views/messages/inbox.php
@@ -40,11 +40,12 @@
 							<input type="checkbox" name="message[id][]" value="<?php echo $item['id'] ?>" />
 						</div>
 					</td>
-					<td class="message-caller message-details-link">
+					<td class="message-caller message-details-link" style="width:220px">
 						<span class="phone-number"><?php echo $item['caller'] ?></span>
 						<a href="<?php echo site_url("messages/details/{$item['id']}")?>" class="quick-call-button"><span class="replace"><?php echo $item['caller'] ?></span></a>
 						<?php if($item['type'] == 'sms'): ?>
 						<a href="<?php echo site_url("messages/details/{$item['id']}")?>" class="quick-sms-button"><span class="replace"><?php echo $item['caller'] ?></span></a>
+						<?php echo (substr($item['sid'],0,2) == 'MM'?'<span class="phone-number" title="Click to View Media">&nbsp;mms</span>':'') ?>
 						<?php endif; ?>
 
 						<div id="quick-call-popup-<?php echo $item['id'] ?>" class="quick-call-popup hide">