diff --git a/system/libs/forum.php b/system/libs/forum.php
index b5588992..126663bc 100644
--- a/system/libs/forum.php
+++ b/system/libs/forum.php
@@ -221,7 +221,7 @@ class Forum
 			// TODO: [poll] tag
 			
 			'#\[color=(.*?)\](.*?)\[/color\]#si' => ($xhtml ? '<span style="color: \\1;">\\2</span>' : '<font color="\\1">\\2</font>'),
-			'#\[img\](.*?)\[/img\]#si' => ($xhtml ? '<img src="\\1" border="0" alt="" />' : '<img src="\\1" border="0" alt="">'),
+			'#\[img\](.*?)\[/img\]#si' => ($xhtml ? '<img class="forum-image" style="max-width:550px; max-height; 550px;" src="\\1" border="0" alt="" />' : '<img class="forum-image" style="max-width:550px; max-height; 550px;" src="\\1" border="0" alt="">'),
 			'#\[url=(.*?)\](.*?)\[/url\]#si' => '<a href="\\1" title="\\2">\\2</a>',
 //		'#\[email\](.*?)\[/email\]#si' => '<a href="mailto:\\1" title="Email \\1">\\1</a>',
 			'#\[code\](.*?)\[/code\]#si' => '<code>\\1</code>',
diff --git a/system/pages/forum/new_post.php b/system/pages/forum/new_post.php
index e26ba1ef..035fbd7d 100644
--- a/system/pages/forum/new_post.php
+++ b/system/pages/forum/new_post.php
@@ -116,4 +116,4 @@ if(Forum::canPost($account_logged))
 else
 	echo "Your account is banned, deleted or you don't have any player with level " . $config['forum_level_required'] . " on your account. You can't post.";
 
-?>
\ No newline at end of file
+echo $twig->render('forum.fullscreen.html.twig');
\ No newline at end of file
diff --git a/system/pages/forum/show_thread.php b/system/pages/forum/show_thread.php
index c322984f..317557a6 100644
--- a/system/pages/forum/show_thread.php
+++ b/system/pages/forum/show_thread.php
@@ -89,4 +89,4 @@ foreach($threads as $thread)
 	echo '</td></tr>';
 }
 echo '</table><br /><a href="?subtopic=forum&action=new_post&thread_id='.$thread_id.'"><img src="images/forum/post.gif" border="0" /></a>';
-?>
\ No newline at end of file
+echo $twig->render('forum.fullscreen.html.twig');
diff --git a/system/templates/forum.fullscreen.html.twig b/system/templates/forum.fullscreen.html.twig
new file mode 100644
index 00000000..c3d83ffd
--- /dev/null
+++ b/system/templates/forum.fullscreen.html.twig
@@ -0,0 +1,41 @@
+<div id="FullScreen">
+	<img src="" alt="" />
+</div>
+<style>
+	#FullScreen {
+		height: 100%;
+		display: none;
+		position:fixed;
+		top:0;
+		right:0;
+		bottom:0;
+		left:0;
+		z-index: 100;
+	}
+	#FullScreen img {
+		height: 100%;
+		display: block;
+		margin: 0 auto;
+		cursor: pointer;
+	}
+	
+	.forum-image {
+		cursor: pointer;
+	}
+</style>
+<script type="text/javascript">
+$(function() {
+	$(".forum-image").click(function(event){		
+		var src = $(this).attr('src'); //get the source attribute of the clicked image
+		$('#FullScreen img').attr('src', src); //assign it to the tag for your fullscreen div
+		$('#FullScreen').fadeIn();
+	});
+
+	$("#FullScreen").click(function(){
+		$(this).fadeOut()
+		$("#imgBig").attr("src", "");
+		$("#overlay").hide();
+		$("#overlayContent").hide();
+	});
+});
+</script>
\ No newline at end of file