diff --git a/admin/service_messages.php b/admin/service_messages.php
index 93ad7a5c..8d13ea0a 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -130,150 +130,202 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             </div>
             <form id="service-message" class="form-horizontal" data-toggle="validator" method="post">
                 <div class="modal-body">
-                    <div class="form-group">
-                        <div class="row" style="padding-bottom: 10px;">
-                            <label for="style"
-                                   class="col-md-2 control-label"><?php echo $hesklang['sm_style']; ?></label>
-
-                            <div class="col-md-3">
-                                <div class="radio alert pad-5" style="box-shadow: none; border-radius: 4px;">
-                                    <label>
-                                        <input type="radio" name="style" value="0" onclick="setIcon('')">
-                                        <?php echo $hesklang['sm_none']; ?>
-                                    </label>
+                    <ul class="nav nav-tabs" role="tablist">
+                        <li role="presentation" class="active"><a href="#contents" role="tab" data-toggle="tab">Contents</a></li>
+                        <li role="presentation"><a href="#properties" role="tab" data-toggle="tab">Properties</a></li>
+                    </ul><br>
+                    <div class="tab-content">
+                        <div role="tabpanel" class="tab-pane active" id="contents">
+                            <div class="form-group">
+                                <label for="title"
+                                       class="col-md-2 control-label"><?php echo $hesklang['sm_mtitle']; ?></label>
+                                <div class="col-md-10">
+                                    <input class="form-control"
+                                           placeholder="<?php echo htmlspecialchars($hesklang['sm_mtitle']); ?>"
+                                           type="text" name="title" size="70" maxlength="255"
+                                           data-error="<?php echo htmlspecialchars($hesklang['sm_e_title']); ?>" required>
+                                    <div class="help-block with-errors"></div>
                                 </div>
                             </div>
-                            <div class="col-md-3">
-                                <div class="radio alert alert-success pad-5">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="1" onclick="setIcon('fa fa-check-circle')">
-                                        <?php echo $hesklang['sm_success']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="radio alert alert-info pad-5" onclick="setIcon('fa fa-comment')">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="2">
-                                        <?php echo $hesklang['sm_info']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-3 col-md-offset-2">
-                                <div class="radio alert alert-warning pad-5">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="3"
-                                               onclick="setIcon('fa fa-exclamation-triangle')">
-                                        <?php echo $hesklang['sm_notice']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="radio alert alert-danger pad-5">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="4" onclick="setIcon('fa fa-times-circle')">
-                                        <?php echo $hesklang['sm_error']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="icon" class="col-md-2 control-label"><?php echo $hesklang['sm_icon']; ?></label>
-                        <div class="col-md-10">
-                            <p style="display:none" id="no-icon"><?php echo $hesklang['sm_no_icon']; ?></p>
+                            <div class="form-group">
+                                <label for="message"
+                                       class="col-md-2 control-label"><?php echo $hesklang['sm_msg']; ?></label>
 
-                            <p style="display:none" id="search-icon"><?php echo $hesklang['sm_search_icon']; ?></p>
-
-                            <p style="display:none"
-                               id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
-
-                            <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker"
-                                 data-search="false" data-icon=""></div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="type" class="col-md-2 control-label"><?php echo $hesklang['sm_type']; ?></label>
-
-                        <div class="col-md-2">
-                            <div class="radio pad-5">
-                                <label>
-                                    <input type="radio" name="type" value="0">
-                                    <?php echo $hesklang['sm_published']; ?>
-                                </label>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="radio pad-5">
-                                <label>
-                                    <input type="radio" name="type" value="1">
-                                    <?php echo $hesklang['sm_draft']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="location" class="col-md-2 control-label">[!] Location</label>
-                        <div class="col-sm-4" style="margin-left:20px">
-                            <h5 style="text-decoration: underline;">Customer Pages</h5>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="CUSTOMER_HOME"> Homepage
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="CUSTOMER_KB_HOME"> Knowledgebase Home
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="CUSTOMER_VIEW_KB_ARTICLE"> View Knowledgebase Article
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="CUSTOMER_SUBMIT_TICKET"> Submit Ticket
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="CUSTOMER_VIEW_TICKET"> View Ticket
-                            </div>
-                        </div>
-                        <div class="col-sm-4" style="margin-left:20px">
-                            <h5 style="text-decoration: underline;">Staff Pages</h5>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="STAFF_LOGIN"> Login Page
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="STAFF_HOME"> Homepage
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="STAFF_KB_HOME"> Knowledgebase Home
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="STAFF_VIEW_KB_ARTICLE"> View Knowledgebase Article
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="STAFF_SUBMIT_TICKET"> Submit Ticket
-                            </div>
-                            <div class="checkbox">
-                                <input type="checkbox" name="location[]" value="STAFF_VIEW_TICKET"> View Ticket
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="title"
-                               class="col-md-2 control-label"><?php echo $hesklang['sm_mtitle']; ?></label>
-                        <div class="col-md-10">
-                            <input class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['sm_mtitle']); ?>"
-                                   type="text" name="title" size="70" maxlength="255"
-                                   data-error="<?php echo htmlspecialchars($hesklang['sm_e_title']); ?>" required>
-                            <div class="help-block with-errors"></div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="message"
-                               class="col-md-2 control-label"><?php echo $hesklang['sm_msg']; ?></label>
-
-                        <div class="col-md-10">
+                                <div class="col-md-10">
                             <textarea placeholder="<?php echo htmlspecialchars($hesklang['sm_msg']); ?>"
                                       class="form-control" name="message" id="content"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                        <div role="tabpanel" class="tab-pane" id="properties">
+                            <div class="form-group">
+                                <label for="language" class="col-md-2 control-label">
+                                    <?php echo $hesklang['lgs']; ?>
+                                </label>
+                                <div class="col-md-10">
+                                    <select name="language" class="form-control">
+                                        <option value="ALL"><?php echo $hesklang['all']; ?></option>
+                                        <?php foreach($hesk_settings['languages'] as $name => $info): ?>
+                                        <option value="<?php echo $info['folder']; ?>">
+                                            <?php echo $name; ?>
+                                        </option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="row" style="padding-bottom: 10px;">
+                                    <label for="style"
+                                           class="col-md-2 control-label"><?php echo $hesklang['sm_style']; ?></label>
+
+                                    <div class="col-md-3">
+                                        <div class="radio alert pad-5" style="box-shadow: none; border-radius: 4px;">
+                                            <label>
+                                                <input type="radio" name="style" value="0" onclick="setIcon('')">
+                                                <?php echo $hesklang['sm_none']; ?>
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3">
+                                        <div class="radio alert alert-success pad-5">
+                                            <label style="margin-top: -5px">
+                                                <input type="radio" name="style" value="1" onclick="setIcon('fa fa-check-circle')">
+                                                <?php echo $hesklang['sm_success']; ?>
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3">
+                                        <div class="radio alert alert-info pad-5" onclick="setIcon('fa fa-comment')">
+                                            <label style="margin-top: -5px">
+                                                <input type="radio" name="style" value="2">
+                                                <?php echo $hesklang['sm_info']; ?>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-md-3 col-md-offset-2">
+                                        <div class="radio alert alert-warning pad-5">
+                                            <label style="margin-top: -5px">
+                                                <input type="radio" name="style" value="3"
+                                                       onclick="setIcon('fa fa-exclamation-triangle')">
+                                                <?php echo $hesklang['sm_notice']; ?>
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3">
+                                        <div class="radio alert alert-danger pad-5">
+                                            <label style="margin-top: -5px">
+                                                <input type="radio" name="style" value="4" onclick="setIcon('fa fa-times-circle')">
+                                                <?php echo $hesklang['sm_error']; ?>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="icon" class="col-md-2 control-label"><?php echo $hesklang['sm_icon']; ?></label>
+                                <div class="col-md-10">
+                                    <p style="display:none" id="no-icon"><?php echo $hesklang['sm_no_icon']; ?></p>
+
+                                    <p style="display:none" id="search-icon"><?php echo $hesklang['sm_search_icon']; ?></p>
+
+                                    <p style="display:none"
+                                       id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
+
+                                    <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker"
+                                         data-search="false" data-icon=""></div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="type" class="col-md-2 control-label"><?php echo $hesklang['sm_type']; ?></label>
+
+                                <div class="col-md-2">
+                                    <div class="radio pad-5">
+                                        <label>
+                                            <input type="radio" name="type" value="0">
+                                            <?php echo $hesklang['sm_published']; ?>
+                                        </label>
+                                    </div>
+                                </div>
+                                <div class="col-md-2">
+                                    <div class="radio pad-5">
+                                        <label>
+                                            <input type="radio" name="type" value="1">
+                                            <?php echo $hesklang['sm_draft']; ?>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="location" class="col-md-2 control-label">[!] Location</label>
+                                <div class="col-sm-4" style="margin-left:20px">
+                                    <h5 style="text-decoration: underline;">Customer Pages</h5>
+                                    <div class="btn-group btn-group-sm">
+                                        <div data-select-all="customer-location" class="btn btn-default">
+                                            Select All
+                                        </div>
+                                        <div data-deselect-all="customer-location" class="btn btn-default">
+                                            Deselect All
+                                        </div>
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="customer-location" type="checkbox"
+                                               name="location[]" value="CUSTOMER_HOME"> Homepage
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="customer-location" type="checkbox"
+                                               name="location[]" value="CUSTOMER_KB_HOME"> Knowledgebase Home
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="customer-location" type="checkbox"
+                                               name="location[]" value="CUSTOMER_VIEW_KB_ARTICLE"> View Knowledgebase Article
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="customer-location" type="checkbox"
+                                               name="location[]" value="CUSTOMER_SUBMIT_TICKET"> Submit Ticket
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="customer-location" type="checkbox"
+                                               name="location[]" value="CUSTOMER_VIEW_TICKET"> View Ticket
+                                    </div>
+                                </div>
+                                <div class="col-sm-4" style="margin-left:20px">
+                                    <h5 style="text-decoration: underline;">Staff Pages</h5>
+                                    <div class="btn-group btn-group-sm">
+                                        <div data-select-all="staff-location" class="btn btn-default">
+                                            Select All
+                                        </div>
+                                        <div data-deselect-all="staff-location" class="btn btn-default">
+                                            Deselect All
+                                        </div>
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="staff-location" type="checkbox"
+                                               name="location[]" value="STAFF_LOGIN"> Login Page
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="staff-location" type="checkbox"
+                                               name="location[]" value="STAFF_HOME"> Homepage
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="staff-location" type="checkbox"
+                                               name="location[]" value="STAFF_KB_HOME"> Knowledgebase Home
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="staff-location" type="checkbox"
+                                               name="location[]" value="STAFF_VIEW_KB_ARTICLE"> View Knowledgebase Article
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="staff-location" type="checkbox"
+                                               name="location[]" value="STAFF_SUBMIT_TICKET"> Submit Ticket
+                                    </div>
+                                    <div class="checkbox">
+                                        <input data-select-target="staff-location" type="checkbox"
+                                               name="location[]" value="STAFF_VIEW_TICKET"> View Ticket
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div id="preview-pane"></div>
diff --git a/install/migrations/core.php b/install/migrations/core.php
index db30e5ac..405144a1 100644
--- a/install/migrations/core.php
+++ b/install/migrations/core.php
@@ -217,6 +217,8 @@ function getAllMigrations() {
         160 => new UpdateMigration('3.2.1', '3.2.0', 160),
         161 => new UpdateMigration('3.2.2', '3.2.1', 161),
         // 3.3.0
-        162 => new \v330\CreateServiceMessageToLocationTable(162),
+        162 => new \v330\ServiceMessagesImprovements\CreateServiceMessageToLocationTable(162),
+        163 => new \v330\ServiceMessagesImprovements\UpdateExistingServiceMessagesLocations(163),
+        164 => new \v330\ServiceMessagesImprovements\AddLanguageColumnToServiceMessages(164),
     );
 }
\ No newline at end of file
diff --git a/install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php b/install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php
new file mode 100644
index 00000000..21481b99
--- /dev/null
+++ b/install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace v330\ServiceMessagesImprovements;
+
+
+class AddLanguageColumnToServiceMessages extends \AbstractUpdatableMigration {
+
+    function innerUp($hesk_settings) {
+        $this->executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages`
+            ADD COLUMN `mfh_language` VARCHAR(255) NOT NULL DEFAULT 'ALL'");
+    }
+
+    function innerDown($hesk_settings) {
+        $this->executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages`
+            DROP COLUMN `mfh_language`");
+    }
+}
\ No newline at end of file
diff --git a/install/migrations/v330/CreateServiceMessageToLocationTable.php b/install/migrations/v330/ServiceMessagesImprovements/CreateServiceMessageToLocationTable.php
similarity index 91%
rename from install/migrations/v330/CreateServiceMessageToLocationTable.php
rename to install/migrations/v330/ServiceMessagesImprovements/CreateServiceMessageToLocationTable.php
index 066ab39c..0fe7d1ec 100644
--- a/install/migrations/v330/CreateServiceMessageToLocationTable.php
+++ b/install/migrations/v330/ServiceMessagesImprovements/CreateServiceMessageToLocationTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace v330;
+namespace v330\ServiceMessagesImprovements;
 
 
 class CreateServiceMessageToLocationTable extends \AbstractUpdatableMigration {
diff --git a/install/migrations/v330/UpdateExistingServiceMessagesLocations.php b/install/migrations/v330/ServiceMessagesImprovements/UpdateExistingServiceMessagesLocations.php
similarity index 94%
rename from install/migrations/v330/UpdateExistingServiceMessagesLocations.php
rename to install/migrations/v330/ServiceMessagesImprovements/UpdateExistingServiceMessagesLocations.php
index 899909dc..b9da7cc4 100644
--- a/install/migrations/v330/UpdateExistingServiceMessagesLocations.php
+++ b/install/migrations/v330/ServiceMessagesImprovements/UpdateExistingServiceMessagesLocations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace v330;
+namespace v330\ServiceMessagesImprovements;
 
 
 use BusinessLogic\ServiceMessages\ServiceMessageLocation;