Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

Conflicts:
	include/text.php

diff --cc include/text.php
index 2a8b84c65f580acdc87cf712dcd8818dff289ed2,ea5deb4c1442a7c43ebb8929dbac66f64209290a..43cdad8ba612adee2e4a6e03ba6fafde3a2d13c8
--- 1/include/text.php
--- 2/include/text.php
+++ b/include/text.php
@@@ -1397,12 -1411,11 +1411,11 @@@ function prepare_body(&$item, $attach 
                                                ));
                                        }
  
 -                                      $filetype = strtolower(substr( $mime, 0, strpos($mime,'/') ));
 +                                      $filetype = strtolower(substr($mime, 0, strpos($mime,'/')));
-                                       if($filetype) {
+                                       if ($filetype) {
 -                                              $filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 ));
 +                                              $filesubtype = strtolower(substr($mime, strpos($mime,'/') + 1));
                                                $filesubtype = str_replace('.', '-', $filesubtype);
-                                       }
-                                       else {
+                                       } else {
                                                $filetype = 'unkn';
                                                $filesubtype = 'unkn';
                                        }