diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl b/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
index 77b4f2d8e..d11710c85 100644
--- a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
+++ b/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl
@@ -55,7 +55,7 @@
 		<span class="message-date">&nbsp;<i class="icon-calendar"></i> - {dateFormat date=$message.date_add full=0} - <i class="icon-time"></i> {$message.date_add|substr:11:5}</span>
 		{if $message.private}<span class="badge badge-info">{l s='Private'}</span>{/if}
 		{if isset($message.file_name)} <span class="message-product">&nbsp;<i class="icon-link"></i> <a href="{$message.file_name|escape:'html':'UTF-8'}" class="_blank">{l s="Attachment"}</a></span>{/if}
-		{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" class="_blank">{l s="Room type:"} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
+		{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" class="_blank">{if isset($message.booking_product) && $message.booking_product}{l s="Room type:"}{else}{l s="Product:"}{/if} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
 		<p class="message-item-text">{$message.message|escape:'html':'UTF-8'|nl2br}</p>
 	</div>
 </div>
diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php
index 63771fda5..ea35a45ff 100644
--- a/controllers/admin/AdminCustomerThreadsController.php
+++ b/controllers/admin/AdminCustomerThreadsController.php
@@ -860,7 +860,12 @@ class AdminCustomerThreadsControllerCore extends AdminController
                 $product = new Product((int)$mess['id_product'], false, $this->context->language->id);
                 if (Validate::isLoadedObject($product)) {
                     $messages[$key]['product_name'] = $product->name;
-                    $messages[$key]['product_link'] = $this->context->link->getAdminLink('AdminProducts').'&updateproduct&id_product='.(int)$product->id;
+                    $messages[$key]['booking_product'] = $product->booking_product;
+                    if ($product->booking_product) {
+                        $messages[$key]['product_link'] = $this->context->link->getAdminLink('AdminProducts').'&updateproduct&id_product='.(int)$product->id;
+                    } else {
+                        $messages[$key]['product_link'] = $this->context->link->getAdminLink('AdminNormalProducts').'&updateproduct&id_product='.(int)$product->id;
+                    }
                 }
             }
         }
@@ -981,8 +986,6 @@ class AdminCustomerThreadsControllerCore extends AdminController
         $timeline = array();
         foreach ($messages as $message) {
             $product = new Product((int)$message['id_product'], false, $this->context->language->id);
-            $link_product = $this->context->link->getAdminLink('AdminOrders').'&vieworder&id_order='.(int)$product->id;
-
             $content = '';
             if (!$message['private']) {
                 $customerName = false;
@@ -1000,7 +1003,13 @@ class AdminCustomerThreadsControllerCore extends AdminController
             }
 
             if (Validate::isLoadedObject($product)) {
-                $content .= $this->l('Room type: ').'<span class="label label-info">'.$product->name.'</span><br/><br/>';
+                if ($product->booking_product) {
+                    $content .= $this->l('Room type:');
+                } else {
+                    $content .= $this->l('Product:');
+                }
+
+                $content .= ' <span class="label label-info">'.$product->name.'</span><br/><br/>';
             }
             $content .= Tools::safeOutput($message['message']);
 
diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
index 7d8987fc4..d8cadf9e9 100644
--- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
@@ -275,7 +275,7 @@
 													<td><input type="checkbox" name="id_order_return_detail[]" value="{$product['id_order_return_detail']|escape:'html':'UTF-8'}" checked/></td>
 												{/if}
 												<td>{$product['name']|escape:'htmlall':'UTF-8'}{if isset($product['option_name']) && $product['option_name']} : {$product['option_name']|escape:'htmlall':'UTF-8'}{/if}</td>
-												<td>{$product['quantity']|escape:'htmlall':'UTF-8'}</td>
+												<td>{if $product['allow_multiple_quantity']}{$product['quantity']|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
 												<td>{displayPrice price=$product['total_price_tax_incl'] currency=$orderCurrency['id']}</td>
 												<td>{displayPrice price=$product['paid_amount'] currency=$orderCurrency['id']}</td>
 												{if $hasOrderDiscountOrPayment || $isRefundCompleted}
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index 222e6e978..d1a4cbae1 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -595,18 +595,28 @@
                                 {block name='order_detail_add_order_messages_form'}
                                     <form action="{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}" method="post" class="std" id="sendOrderMessage">
                                         <div class="form-group select-room-type">
-                                            <label for="id_product">{l s='Room Type'}</label>
+                                            <label for="id_product">{l s='Room Type'}{if $service_products_formatted}/{l s='Product'}{/if}</label>
                                             <p class="card-subheader text-muted">
-                                                {l s='To add a comment about a room type, please select one first.'}
+                                                {if $service_products_formatted}
+                                                    {l s='To add a comment about a room type/product, please select one first.'}
+                                                {else}
+                                                    {l s='To add a comment about a room type, please select one first.'}
+                                                {/if}
                                             </p>
-
                                             <select name="id_product" class="form-control">
                                                 <option value="0">{l s='-- Choose --'}</option>
-                                                {foreach from=$roomTypes item=product}
-                                                    {if $product.is_booking_product}
-                                                        <option value="{$product.product_id}">{$product.product_name|escape:'html':'UTF-8'}</option>
-                                                    {/if}
-                                                {/foreach}
+                                                {if $roomTypes}
+                                                    {foreach from=$roomTypes item=product}
+                                                        {if $product.is_booking_product}
+                                                            <option value="{$product.product_id}">{$product.product_name|escape:'html':'UTF-8'}</option>
+                                                        {/if}
+                                                    {/foreach}
+                                                {/if}
+                                                {if $service_products_formatted}
+                                                    {foreach from=$service_products_formatted item=product}
+                                                        <option value="{$product.id_product}">{$product.name|escape:'html':'UTF-8'}</option>
+                                                    {/foreach}
+                                                {/if}
                                             </select>
                                         </div>