diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index cd45129a..bf0d0872 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -2094,6 +2094,28 @@ if ( defined('HESK_DEMO') )
                           </div>
                       </div>
                   </div>
+                  <div class="form-group">
+                      <label for="email_attachments" class="col-sm-4 col-xs-12 control-label">
+                          <?php echo $hesklang['email_attachments']; ?>
+                          <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                             title="<?php echo $hesklang['email_attachments']; ?>"
+                             data-content="<?php echo $hesklang['email_attachments_help']; ?>"></i>
+                      </label>
+                      <div class="col-sm-8 col-xs-12">
+                          <div class="radio">
+                              <label>
+                                  <input type="radio" name="email_attachments" value="0" <?php echo $modsForHesk_settings['attachments'] == 0 ? 'checked' : ''; ?>>
+                                  <?php echo $hesklang['show_attachments_as_links']; ?>
+                              </label>
+                          </div>
+                          <div class="radio">
+                              <label>
+                                  <input type="radio" name="email_attachments" value="1" <?php echo $modsForHesk_settings['attachments'] == 1 ? 'checked' : ''; ?>>
+                                  <?php echo $hesklang['attach_directly_to_email']; ?>
+                              </label>
+                          </div>
+                      </div>
+                  </div>
                   <div class="form-group">
                       <label for="use_bootstrap_theme" class="col-sm-4 col-xs-12 control-label">
                           <?php echo $hesklang['use_bootstrap_theme']; ?>
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 00acc2b4..6c200206 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -621,6 +621,7 @@ $set['customer-email-verification-required'] = empty($_POST['email-verification'
 $set['html_emails'] = empty($_POST['html_emails']) ? 0 : 1;
 $set['use_bootstrap_theme'] = empty($_POST['use_bootstrap_theme']) ? 0 : 1;
 $set['new_kb_article_visibility'] = hesk_checkMinMax( intval( hesk_POST('new_kb_article_visibility') ) , 0, 2, 2);
+$set['mfh_attachments'] = empty($_POST['email_attachments']) ? 0 : 1;
 
 if ($set['customer-email-verification-required'])
 {
@@ -677,7 +678,10 @@ $modsForHesk_settings[\'mailgun_domain\'] = \''.$set['mailgun_domain'].'\';
 $modsForHesk_settings[\'use_bootstrap_theme\'] = '.$set['use_bootstrap_theme'].';
 
 //-- Default value for new Knowledgebase article: 0 = Published, 1 = Private, 2 = Draft
-$modsForHesk_settings[\'new_kb_article_visibility\'] = '.$set['new_kb_article_visibility'].';';
+$modsForHesk_settings[\'new_kb_article_visibility\'] = '.$set['new_kb_article_visibility'].';
+
+//-- Setting for adding attachments to email messages. Either 0 for default-HESK behavior, or 1 to send as attachments
+$modsForHesk_settings[\'attachments\'] = '.$set['mfh_attachments'].';';
 
 // Write the file
 if ( ! file_put_contents(HESK_PATH . 'modsForHesk_settings.inc.php', $modsForHesk_file_content) )
diff --git a/language/en/text.php b/language/en/text.php
index 3020f884..895f6f70 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -61,6 +61,11 @@ $hesklang['no_title_case'] = 'No';
 $hesklang['autoclose_ticket_status'] = 'When a ticket is closed automatically, change the status to';
 $hesklang['recent_tickets'] = 'Recent tickets';
 $hesklang['current_status_colon'] = 'Current status: %s'; // %s: status name (i.e. "Resolved", "New", etc.)
+$hesklang['email_attachments'] = 'Email attachments';
+$hesklang['email_attachments_help'] = '<b>Show attachments as links:</b> Links to attachments will be appended at the end of the email.
+    <br><br><b>Attach directly to email:</b> Attachments will be embedded directly into emails.';
+$hesklang['show_attachments_as_links'] = 'Show attachments as links';
+$hesklang['attach_directly_to_email'] = 'Attach directly to email';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.1.1
 $hesklang['new_article_default_type'] = 'Default Type for New Articles';