diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index d7749130a2..9c20ad8dfe 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -4,7 +4,8 @@ HumHub Change Log
 
 1.2.0-beta.3 under developement
 --------------------------------
-- Enh: Added global (default) notification space settings.
+- Enh: Added mp4/ogg blueimp support in post gallery
+- Enh: Added global (default) notification space settings
 - Enh: #2359 Use Jplayer playlist feature for post mp3
 - Enh: added js module 'ui.view' for view state and utils - Changed 'ui.state.getState' to 'ui.view.getState'
 - Enh: added view helper as getHeight/Width and isSmall/Medium/Normal (width) to 'ui.view' js module
diff --git a/protected/humhub/modules/file/widgets/views/showFiles.php b/protected/humhub/modules/file/widgets/views/showFiles.php
index 52f2ac54ea..20ccb4d753 100644
--- a/protected/humhub/modules/file/widgets/views/showFiles.php
+++ b/protected/humhub/modules/file/widgets/views/showFiles.php
@@ -13,17 +13,24 @@ $object = $this->context->object;
     <div class="post-files" id="post-files-<?php echo $object->getUniqueId(); ?>">
         <?php foreach ($files as $file): ?>
             <?php if ($previewImage->applyFile($file)): ?>
-                <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>"  href="<?= $file->getUrl(); ?>#.jpeg">
+                <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" href="<?= $file->getUrl(); ?>#.jpeg" title="<?= $file->file_name ?>">
                     <?= $previewImage->render(); ?>
                 </a>
+            <?php elseif(FileHelper::getExtension($file->file_name) == 'mp4'): ?>
+                <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" type="video/mp4" href="<?= $file->getUrl(); ?>#.mp4" title="<?= $file->file_name ?>">
+                    <video src="<?= $file->getUrl() ?>" height="130" />
+                </a>
+            <?php elseif(FileHelper::getExtension($file->file_name) == 'ogv'): ?>
+                <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" type="video/ogg" href="<?= $file->getUrl(); ?>#.ogv" title="<?= $file->file_name ?>">
+                    <video src="<?= $file->getUrl() ?>" height="130" />
+                </a>
             <?php endif; ?>
         <?php endforeach; ?>
         
         <?php $playlist = [] ?>
         
         <?php foreach ($files as $file): ?>
-            <?php $fileExtension = FileHelper::getExtension($file->file_name); ?>
-            <?php if ($fileExtension == "mp3") : ?>
+            <?php if (FileHelper::getExtension($file->file_name) == "mp3") : ?>
                 <?php $playlist[] = $file ?>
             <?php endif; ?>
         <?php endforeach; ?>