diff --git a/include/ajax.kbase.php b/include/ajax.kbase.php
index 1e642847bba383d986bafeadadee6370bcec54ed..c6bbd3156ecba7893839e0e1bc8c1404a32f9266 100644
--- a/include/ajax.kbase.php
+++ b/include/ajax.kbase.php
@@ -78,7 +78,7 @@ class KbaseAjaxAPI extends AjaxController {
                  <hr>
                  <a href="faq.php?id=%d">View</a> | <a href="faq.php?id=%d">Attachments (%s)</a>',
                 $faq->getQuestion(),
-                $faq->getAnswer(),
+                $faq->getAnswerWithImages(),
                 Format::db_daydatetime($faq->getUpdateDate()),
                 $faq->getId(),
                 $faq->getId(),
diff --git a/include/class.faq.php b/include/class.faq.php
index 159a423bbfd8c1ac7293e4d491625d2eaa63b595..d009d58c3bce290d758fa05edeb12b3872c938e9 100644
--- a/include/class.faq.php
+++ b/include/class.faq.php
@@ -59,7 +59,8 @@ class FAQ {
     function getHashtable() { return $this->ht; }
     function getKeywords() { return $this->ht['keywords']; }
     function getQuestion() { return $this->ht['question']; }
-    function getAnswer() {
+    function getAnswer() { return $this->ht['answer']; }
+    function getAnswerWithImages() {
         return Format::viewableImages($this->ht['answer'], ROOT_PATH.'image.php');
     }
     function getNotes() { return $this->ht['notes']; }
diff --git a/include/client/faq.inc.php b/include/client/faq.inc.php
index a588eff5ff3618828e682f7cd363e8ca15544362..9dc70af789f3fab716613795b46278042d5351bf 100644
--- a/include/client/faq.inc.php
+++ b/include/client/faq.inc.php
@@ -15,7 +15,7 @@ $category=$faq->getCategory();
 <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"></div>
 <div class="clear"></div>
 <p>
-<?php echo Format::safe_html($faq->getAnswer()); ?>
+<?php echo Format::safe_html($faq->getAnswerWithImages()); ?>
 </p>
 <p>
 <?php
diff --git a/include/staff/faq-view.inc.php b/include/staff/faq-view.inc.php
index 514eca3f074a6215db50f8cda4fe786a8a836e82..f505e612fd98788cc86e07dfeb92174f8d74c473 100644
--- a/include/staff/faq-view.inc.php
+++ b/include/staff/faq-view.inc.php
@@ -24,7 +24,7 @@ if($thisstaff->canManageFAQ()) {
 </div>
 <div class="clear"></div>
 <div class="thread-body">
-<?php echo $faq->getAnswer(); ?>
+<?php echo $faq->getAnswerWithImages(); ?>
 </div>
 <div class="clear"></div>
 <p>
diff --git a/include/staff/faq.inc.php b/include/staff/faq.inc.php
index e700bd429b8eaa20bb3c2ac5fa1816d798b39425..476cf5b0af0e9a4a9cb63d4ec8edc6051c455a27 100644
--- a/include/staff/faq.inc.php
+++ b/include/staff/faq.inc.php
@@ -9,7 +9,7 @@ if($faq){
     $info=$faq->getHashtable();
     $info['id']=$faq->getId();
     $info['topics']=$faq->getHelpTopicsIds();
-    $info['answer']=$faq->getAnswer();
+    $info['answer']=Format::viewableImages($faq->getAnswer());
     $info['notes']=Format::viewableImages($faq->getNotes());
     $qstr='id='.$faq->getId();
 }else {