diff --git a/include/class.config.php b/include/class.config.php
index 08881a4d385e7e8a5df84faae34675c5ddd7ce02..04a7cea4546bdf65430034564fd3d2812a5fc50a 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -962,7 +962,6 @@ class OsticketConfig extends Config {
             'enable_html_thread'=>isset($vars['enable_html_thread'])?1:0,
             'allow_client_updates'=>isset($vars['allow_client_updates'])?1:0,
             'max_file_size'=>$vars['max_file_size'],
-            'email_attachments'=>isset($vars['email_attachments'])?1:0,
         ));
     }
 
@@ -996,6 +995,7 @@ class OsticketConfig extends Config {
             'accept_unregistered_email'=>isset($vars['accept_unregistered_email'])?1:0,
             'add_email_collabs'=>isset($vars['add_email_collabs'])?1:0,
             'reply_separator'=>$vars['reply_separator'],
+            'email_attachments'=>isset($vars['email_attachments'])?1:0,
          ));
     }
 
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index 228791074b65c01b5afd8d3ca254a71ee12d69e9..b10facabe98d61a05eccf10736e37b4269721c20 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -153,6 +153,14 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
                  <i class="help-tip icon-question-sign" href="#default_mta"></i>
            </td>
        </tr>
+        <tr>
+            <td width="180"><?php echo __('Attachments');?>:</td>
+            <td>
+                <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?>>
+                <?php echo __('Email attachments to the user'); ?>
+                <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
+            </td>
+        </tr>
     </tbody>
 </table>
 <p style="padding-left:250px;">
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 2e23da95068b404e91ace8b02749690fb2b9a802..d64c52ed12a4f7e4148598e75d292a93430cbe59 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -268,14 +268,6 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
                 <div class="error"><?php echo $errors['max_file_size']; ?></div>
             </td>
         </tr>
-        <tr>
-            <td width="180"><?php echo __('Ticket Response Files');?>:</td>
-            <td>
-                <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?>>
-                <?php echo __('Email attachments to the user'); ?>
-                <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
-            </td>
-        </tr>
         <?php if (($bks = FileStorageBackend::allRegistered())
                 && count($bks) > 1) { ?>
         <tr>