diff --git a/etemplate/templates/default/images/mime16_application_vnd.openxmlformats-officedocument.wordprocessingml.document.gif b/etemplate/templates/default/images/mime16_application_vnd.openxmlformats-officedocument.wordprocessingml.document.gif
new file mode 100644
index 0000000000..a343a3ca7e
Binary files /dev/null and b/etemplate/templates/default/images/mime16_application_vnd.openxmlformats-officedocument.wordprocessingml.document.gif differ
diff --git a/phpgwapi/inc/class.mime_magic.inc.php b/phpgwapi/inc/class.mime_magic.inc.php
index dce56dfab0..e237d3fd7e 100644
--- a/phpgwapi/inc/class.mime_magic.inc.php
+++ b/phpgwapi/inc/class.mime_magic.inc.php
@@ -255,6 +255,7 @@ class mime_magic
 		'dll'	=> 'application/octet-stream',
 		'dms'	=> 'application/octet-stream',
 		'doc'	=> 'application/msword',
+		'docx'	=> 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',	// msword xml format
 		'dot'	=> 'application/msword',//added by skwashd
 		'dvi'	=> 'application/x-dvi',
 		'dxr'	=> 'application/x-director',