diff --git a/app/templates/forum.forkbb.php b/app/templates/forum.forkbb.php
index 2f973a3f00965ea99c7cc9d66f72a2f3700b2bfc..a1e16ae10450a32a107ee1a120e703882bab11df 100644
--- a/app/templates/forum.forkbb.php
+++ b/app/templates/forum.forkbb.php
@@ -103,7 +103,7 @@
             @if ($topic->closed)
                   <span class="f-tclosed" title="{!! __('Closed') !!}"><span class="f-closedtxt">{!! __('Closed') !!}</span></span>
             @endif
-            @if ($topic->poll_type)
+            @if ($topic->poll_type > 0)
                   <span class="f-tpoll" title="{!! __('Poll') !!}"><span class="f-polltxt">{!! __('Poll') !!}</span></span>
             @endif
                   <a class="f-ftname" href="{!! $topic->link !!}">{{ $topic->censorSubject }}</a>
diff --git a/app/templates/layouts/poll.forkbb.php b/app/templates/layouts/poll.forkbb.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0e7711a97c492db032df09bb0e89801b76a7d0d
--- /dev/null
+++ b/app/templates/layouts/poll.forkbb.php
@@ -0,0 +1,42 @@
+        <div class="f-post-poll">
+@if ($poll->canVote)
+          <form>
+@endif
+@foreach ($poll->question as $q => $question)
+            <fieldset id="id-question-{!! $q !!}" class="f-poll-q">
+              <legend class="f-poll-ql">{!! __('Question %s legend', $q) !!}</legend>
+              <h3 class="f-poll-qt">{{ $question }}</h3>
+    @if ($poll->type[$q] > 1)
+              <p class="f-poll-mult">{!! __('You can choose up to %s answers', $poll->type[$q]) !!}</p>
+    @endif
+              <ol class="f-poll-as">
+    @foreach ($poll->answer[$q] as $a => $answer)
+                <li id="id-answer-{!! $q . '-' . $a !!}" class="f-poll-a">
+        @if ($poll->canVote || ! $poll->tid)
+                 <label class="f-poll-al">
+            @if ($poll->type[$q] > 1)
+                    <input class="f-poll-ai" type="checkbox" name="poll_vote[{!! $q !!}][{!! $a !!}]" value="1" />
+            @else
+                    <input class="f-poll-ai" type="radio" name="poll_vote[{!! $q !!}][0]" value="{!! $a !!}" />
+            @endif
+                    <span class="f-poll-at">{{ $answer }}</span>
+                  </label>
+        @elseif ($poll->canSeeResult)
+                  <span class="f-poll-at">{{ $answer }}</span>
+                  <span class="f-poll-ap">(votes 1 [100%])</span>
+                  <p class="f-poll-ab"><span style="width: 100%;"><span>100%</span></span></p>
+        @else
+                  <label class="f-poll-al">
+                    <span class="f-poll-at">{{ $answer }}</span>
+                  </label>
+        @endif
+                </li>
+    @endforeach
+              </ol>
+              <p class="f-poll-total">{!! __('In total voted: %s', 0) !!}</p>
+            </fieldset>
+@endforeach
+@if ($poll->canVote)
+          </form>
+@endif
+        </div>
diff --git a/app/templates/post.forkbb.php b/app/templates/post.forkbb.php
index 04b20de8d8a130abdbe60e848849c7c1982dcc7a..700df36e3a6ef8aad1d325dc6b4300f277eb361b 100644
--- a/app/templates/post.forkbb.php
+++ b/app/templates/post.forkbb.php
@@ -10,6 +10,9 @@
         <div class="f-post-main">
           {!! $p->previewHtml !!}
         </div>
+    @if ($poll = $p->poll)
+        @include ('layouts/poll')
+    @endif
       </div>
     </section>
 @endif
diff --git a/app/templates/topic.forkbb.php b/app/templates/topic.forkbb.php
index 1fa5e1c9475409244ed3af265f9e10891639e176..9e6065e584d73b24a7035f431854e37e61549545 100644
--- a/app/templates/topic.forkbb.php
+++ b/app/templates/topic.forkbb.php
@@ -104,6 +104,9 @@
           <div class="f-post-main">
             {!! $post->html() !!}
           </div>
+        @if (1 === $post->postNumber && ($poll = $p->poll))
+            @include ('layouts/poll')
+        @endif
         @if ($p->user->showSignature && $post->user->isSignature)
           <div class="f-post-signature">
             <hr>