diff --git a/inc/instance-config.php b/inc/instance-config.php
index a212d323..068055b7 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -141,6 +141,7 @@
 	$config['additional_javascript'][] = 'js/auto-scroll.js';
 	$config['additional_javascript'][] = 'js/twemoji/twemoji.js';
 	$config['additional_javascript'][] = 'js/file-selector.js';
+	$config['additional_javascript'][] = 'js/gallery-view.js';
 	$config['additional_javascript'][] = 'js/board-directory.js';
 	// Oekaki (now depends on config.oekaki so can be in all scripts)
 	$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
diff --git a/js/gallery-view.js b/js/gallery-view.js
new file mode 100644
index 00000000..2d7d85b4
--- /dev/null
+++ b/js/gallery-view.js
@@ -0,0 +1,165 @@
+if (active_page == 'index' || active_page == 'thread')
+$(function(){
+
+  var gallery_view = false;
+
+  $('hr:first').before('<div id="gallery-view" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
+  $('#gallery-view a').html(gallery_view ? _("Disable gallery mode") : _("Enable gallery mode")).click(function() {
+    gallery_view = !gallery_view;
+    $(this).html(gallery_view ? _("Disable gallery mode") : _("Enable gallery mode"));
+    toggle_gview(document);
+  });
+
+  var toggle_gview = function(elem) {
+    if (gallery_view) {
+      $(elem).find('img.post-image').parent().each(function() { 
+        this.oldonclick = this.onclick;
+        this.onclick = handle_click;
+        $(this).attr('data-galid', Math.random());
+      });
+    }
+    else {
+      $(elem).find('img.post-image').parent().each(function() {
+        if (this.onclick == handle_click) this.onclick = this.oldonclick;
+      });
+    }
+  };
+
+  $(document).on('new_post', toggle_gview);
+
+  var gallery_opened = false;
+
+  var handle_click = function(e) {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (!gallery_opened) open_gallery();
+
+    gallery_setimage($(this).attr('data-galid'));
+  };
+
+  var handler, images, active, toolbar;
+
+  var open_gallery = function() {
+    $('body').css('overflow', 'hidden');
+
+    gallery_opened = true;
+
+    handler = $("<div id='alert_handler'></div>").hide().appendTo('body').css('text-align', 'left');
+
+    $("<div id='alert_background'></div>").click(close_gallery).appendTo(handler);
+
+    images = $("<div id='gallery_images'></div>").appendTo(handler);
+    toolbar = $("<div id='gallery_toolbar'></div>").appendTo(handler);
+    active = $("<div id='gallery_main'></div>").appendTo(handler);
+
+    active.on('click', function() {
+      close_gallery();
+    });
+
+    $('img.post-image').parent().each(function() {
+      var thumb = $(this).find('img').attr('src');
+
+      var i = $('<img>').appendTo(images);
+      i.attr('src', thumb);
+      i.attr('data-galid-th', $(this).attr('data-galid'));
+
+      i.on('click', function(e) {
+        gallery_setimage($(this).attr('data-galid-th'));
+      });
+    });
+
+    $("<a href='javascript:void(0)'><i class='fa fa-times'></i></div>")
+    .click(close_gallery).appendTo(toolbar);
+
+    $('body').on('keydown.gview', function(e) {
+      if (e.which == 39 || e.which == 40) { // right or down arrow
+        gallery_setimage(+1);
+        e.preventDefault();
+      }
+      else if (e.which == 37 || e.which == 38) { // left or up arrow
+        gallery_setimage(-1);
+        e.preventDefault();
+      }
+    });
+
+    handler.fadeIn(400);
+  };
+
+  var gallery_setimage = function(a) {
+    if (a == +1 || a == -1) {
+      var meth = (a == -1) ? 'prev' : 'next';
+      a = $('#gallery_images img.active')[meth]().attr('data-galid-th');
+      if (!a) return;
+    }
+
+    $('#gallery_images img.active').removeClass('active');
+
+    var thumb = $('#gallery_images [data-galid-th="'+a+'"]');
+    var elem = $('a[data-galid="'+a+'"]');
+
+    thumb.addClass('active');
+
+    var topscroll = thumb.position().top + images.scrollTop();
+    topscroll -= images.height() / 2;
+    topscroll += thumb.height() / 2;
+    images.animate({'scrollTop': topscroll}, 300);
+
+    var img = elem.attr('href');
+
+    active.find('img, video').fadeOut(200, function() { $(this).remove(); });
+
+    var i;
+    if (img.match(/player\.php/)) {
+      img = img.replace(/.*player\.php\?v=|&t=.*/g, '');
+    }
+    if (img.match(/\.webm$|\.mp4$|\.ogv$/i)) { // We are handling video nao
+      i = $('<video>');
+      i.attr('src', img);
+      i.attr('autoplay', true);
+      i.attr('controls', true);
+      i.appendTo(active);
+      i.hide();
+    }
+    else { // Just a plain image
+      i = $('<img>');
+      i.attr('src', img);
+      i.appendTo(active);
+      i.hide();
+    }
+
+    // Let's actually preload the next few images
+    var nextimg = $('#gallery_images active');
+    for (var j = 0; j < 3; j++) { 
+      nextimg = nextimg.next();
+      var attr;
+      if (attr = nextimg.attr('data-gaild-th')) {
+        var href = $('a[data-galid="'+attr+'"]').attr('href');
+        if (href.match(/\.webm|\.mp4|\.ogv/i)) { j--; continue; }
+        if ($('[data-galid-preload="'+attr+'"]').length) continue;
+        var img = $('<img>').attr('src', href).attr('data-galid-preload', attr).hide().appendTo('body').on('load', function() { $(this).remove(); });
+      }
+      else break;
+    }
+
+    i.one('load canplay', function() {
+      i.css('left', 'calc(50% - '+i.width()+'px / 2)');
+      i.css('top', 'calc(50% - '+i.height()+'px / 2)');
+      i.fadeIn(200);
+    }).on('click', function(e) {
+      e.stopPropagation();
+      gallery_setimage(+1);
+    });
+  };
+
+  var close_gallery = function() {
+    $('body').css('overflow', 'auto');
+
+    gallery_opened = false;
+
+    $('body').off('keydown.gview');
+
+    handler.fadeOut(400, function() { handler.remove(); });
+  };
+
+});
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 954f2f4a..145ea4e4 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1650,6 +1650,62 @@ td.board-tags a.tag-link {
 	display: none;
 }
 
+<<<<<<< HEAD
+/* Gallery view */
+#gallery_images {
+  position: absolute;
+  right: 0px;
+  bottom: 0px;
+  top: 0px;
+  width: 12%;
+  background-color: rgba(0, 0, 0, 0.4);
+  overflow: auto;
+}
+#gallery_toolbar {
+  position: absolute;
+  right: 12%;
+  left: 0px;
+  bottom: 0px;
+  height: 32px;
+  background-color: rgba(0, 0, 0, 0.4);
+  text-align: right;
+}
+#gallery_images img {
+  width: 100%;
+}
+#gallery_toolbar a {
+  font-size: 28px;
+  padding-right: 5px;
+}
+#gallery_main {
+  position: absolute;
+  left: 0px;
+  right: 12%;
+  bottom: 32px;
+  top: 0px;
+  padding: 10px;
+}
+
+#gallery_images img {
+  opacity: 0.6;
+  -webkit-transition: all 0.5s;
+          transition: all 0.5s;
+}
+#gallery_images img:hover, #gallery_images img.active {
+  opacity: 1;
+}
+#gallery_images img.active {
+  -webkit-box-shadow: 0px 0px 29px 2px rgba(255,255,255,1);
+     -moz-box-shadow: 0px 0px 29px 2px rgba(255,255,255,1);
+          box-shadow: 0px 0px 29px 2px rgba(255,255,255,1);
+  z-index: 1;
+}
+#gallery_main img, #gallery_main video {
+  max-width: 100%;
+  max-height: 100%;
+  position: absolute;
+}
+
 /* Fileboard */
 table.fileboard th, table.fileboard td {
   padding: 2px;