diff --git a/AttachmentModel.class.php b/AttachmentModel.class.php
index 5aeaf83..22f9f2f 100644
--- a/AttachmentModel.class.php
+++ b/AttachmentModel.class.php
@@ -6,102 +6,6 @@
 
 class AttachmentModel extends ETModel {
 
-	public static $mimes = array(
-
-		'hqx'   => 'application/mac-binhex40',
-		'cpt'   => 'application/mac-compactpro',
-		'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
-		'bin'   => 'application/macbinary',
-		'dms'   => 'application/octet-stream',
-		'lha'   => 'application/octet-stream',
-		'lzh'   => 'application/octet-stream',
-		'exe'   => array('application/octet-stream', 'application/x-msdownload'),
-		'class' => 'application/octet-stream',
-		'psd'   => 'application/x-photoshop',
-		'so'    => 'application/octet-stream',
-		'sea'   => 'application/octet-stream',
-		'dll'   => 'application/octet-stream',
-		'oda'   => 'application/oda',
-		'pdf'   => array('application/pdf', 'application/x-download'),
-		'ai'    => 'application/postscript',
-		'eps'   => 'application/postscript',
-		'ps'    => 'application/postscript',
-		'smi'   => 'application/smil',
-		'smil'  => 'application/smil',
-		'mif'   => 'application/vnd.mif',
-		'xls'   => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
-		'ppt'   => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
-		'wbxml' => 'application/wbxml',
-		'wmlc'  => 'application/wmlc',
-		'dcr'   => 'application/x-director',
-		'dir'   => 'application/x-director',
-		'dxr'   => 'application/x-director',
-		'dvi'   => 'application/x-dvi',
-		'gtar'  => 'application/x-gtar',
-		'gz'    => 'application/x-gzip',
-		'php'   => array('application/x-httpd-php', 'text/x-php'),
-		'php4'  => 'application/x-httpd-php',
-		'php3'  => 'application/x-httpd-php',
-		'phtml' => 'application/x-httpd-php',
-		'phps'  => 'application/x-httpd-php-source',
-		'js'    => 'application/x-javascript',
-		'swf'   => 'application/x-shockwave-flash',
-		'sit'   => 'application/x-stuffit',
-		'tar'   => 'application/x-tar',
-		'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
-		'xhtml' => 'application/xhtml+xml',
-		'xht'   => 'application/xhtml+xml',
-		'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
-		'mid'   => 'audio/midi',
-		'midi'  => 'audio/midi',
-		'mpga'  => 'audio/mpeg',
-		'mp2'   => 'audio/mpeg',
-		'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
-		'aif'   => 'audio/x-aiff',
-		'aiff'  => 'audio/x-aiff',
-		'aifc'  => 'audio/x-aiff',
-		'ram'   => 'audio/x-pn-realaudio',
-		'rm'    => 'audio/x-pn-realaudio',
-		'rpm'   => 'audio/x-pn-realaudio-plugin',
-		'ra'    => 'audio/x-realaudio',
-		'rv'    => 'video/vnd.rn-realvideo',
-		'wav'   => 'audio/x-wav',
-		'bmp'   => 'image/bmp',
-		'gif'   => 'image/gif',
-		'jpeg'  => array('image/jpeg', 'image/pjpeg'),
-		'jpg'   => array('image/jpeg', 'image/pjpeg'),
-		'jpe'   => array('image/jpeg', 'image/pjpeg'),
-		'png'   => 'image/png',
-		'tiff'  => 'image/tiff',
-		'tif'   => 'image/tiff',
-		'css'   => 'text/css',
-		'html'  => 'text/html',
-		'htm'   => 'text/html',
-		'shtml' => 'text/html',
-		'txt'   => 'text/plain',
-		'text'  => 'text/plain',
-		'log'   => array('text/plain', 'text/x-log'),
-		'rtx'   => 'text/richtext',
-		'rtf'   => 'text/rtf',
-		'xml'   => 'text/xml',
-		'xsl'   => 'text/xml',
-		'mpeg'  => 'video/mpeg',
-		'mpg'   => 'video/mpeg',
-		'mpe'   => 'video/mpeg',
-		'qt'    => 'video/quicktime',
-		'mov'   => 'video/quicktime',
-		'avi'   => 'video/x-msvideo',
-		'movie' => 'video/x-sgi-movie',
-		'doc'   => 'application/msword',
-		'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-		'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-		'word'  => array('application/msword', 'application/octet-stream'),
-		'xl'    => 'application/excel',
-		'eml'   => 'message/rfc822',
-		'json'  => array('application/json', 'text/json'),
-
-	);
-
 	public function __construct()
 	{
 		parent::__construct("attachment");
@@ -114,11 +18,8 @@ public function path()
 
 	public function mime($path)
 	{
-		$extension = pathinfo($path, PATHINFO_EXTENSION);
-
-		if ( ! array_key_exists($extension, self::$mimes)) return "application/octet-stream";
-
-		return (is_array(self::$mimes[$extension])) ? self::$mimes[$extension][0] : self::$mimes[$extension];
+		$finfo = new finfo(FILEINFO_MIME_TYPE);
+		return $finfo->file($path);
 	}
 
 	// Find attachments for a specific post or conversation that are being stored in the session, remove
diff --git a/README.md b/README.md
index fad66f0..763736d 100644
--- a/README.md
+++ b/README.md
@@ -19,3 +19,6 @@ Create `definitions.Attachments.php` in your language pack with the following de
 	$definitions["Drop files to upload"] = "Drop files to upload";
 	$definitions["Embed in post"] = "Embed in post";
 	$definitions["message.attachmentNotFound"] = "For some reason this attachment cannot be viewed. It may not exist, or you may not have permission to view it.";
+	$definitions["Enter file extensions separated by a space. Leave blank to allow all file types."] = "Enter file extensions separated by a space. Leave blank to allow all file types.";
+	$definitions["Allowed file types"] = "Allowed file types";
+	
diff --git a/views/settings.php b/views/settings.php
index ad491b5..65c26df 100644
--- a/views/settings.php
+++ b/views/settings.php
@@ -19,13 +19,13 @@
 <ul class='form'>
 
 <li>
-<label>Allowed file types</label>
+<label><?php echo T("Allowed file types"); ?></label>
 <?php echo $form->input("allowedFileTypes", "text"); ?>
 <small><?php echo T("Enter file extensions separated by a space. Leave blank to allow all file types."); ?></small>
 </li>
 
 <li>
-<label>Max file size</label>
+<label><?php echo T("Max file size"); ?></label>
 <?php echo $form->input("maxFileSize", "text"); ?>
 <small><?php echo T("In bytes. Leave blank for no limit."); ?></small>
 </li>