diff --git a/application/controllers/Options.php b/application/controllers/Options.php
index 778756de..c5e3a55b 100644
--- a/application/controllers/Options.php
+++ b/application/controllers/Options.php
@@ -328,22 +328,6 @@ class Options extends CI_Controller {
 				if($smtpPasswordupdate == TRUE) {
 					$this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed_to').$this->input->post('smtpPassword'));
 				}
-
-				// Update emailcrlf choice within the options system
-				$emailcrlfupdate = $this->optionslib->update('emailcrlf', $this->input->post('emailcrlf'), 'yes');
-	
-				// If emailcrlf update is complete set a flashsession with a success note
-				if($emailcrlfupdate == TRUE) {
-					$this->session->set_flashdata('success', $this->lang->line('options_email_crlf_changed_to').$this->input->post('emailcrlf'));
-				}
-
-				// Update emailnewline choice within the options system
-				$emailnewlineupdate = $this->optionslib->update('emailnewline', $this->input->post('emailnewline'), 'yes');
-	
-				// If emailnewline update is complete set a flashsession with a success note
-				if($emailnewlineupdate == TRUE) {
-					$this->session->set_flashdata('success', $this->lang->line('options_email_newline_changed_to').$this->input->post('emailnewline'));
-				}
 	
 				// Redirect back to /appearance
 				redirect('/options/email');
diff --git a/application/views/options/email.php b/application/views/options/email.php
index 48ae318c..b02d8487 100644
--- a/application/views/options/email.php
+++ b/application/views/options/email.php
@@ -100,20 +100,6 @@
                             </div>
                         </div>
 
-                        <div class="form-group row">
-                            <label for="emailcrlf" class="col-sm-2 col-form-label"><?php echo lang('options_crlf'); ?></label>
-                            <div class="col-sm-10">
-                                <input type="text" name="emailcrlf" class="form-control" id="emailcrlf" value="<?php if($this->optionslib->get_option('emailcrlf') != "") { echo $this->optionslib->get_option('emailcrlf'); } ?>">
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="emailnewline" class="col-sm-2 col-form-label"><?php echo lang('options_newline'); ?></label>
-                            <div class="col-sm-10">
-                                <input type="text" name="emailnewline" class="form-control" id="emailnewline" value="<?php if($this->optionslib->get_option('emailnewline') != "") { echo $this->optionslib->get_option('emailnewline'); } ?>">
-                            </div>
-                        </div>
-
                         <!-- Save the Form -->
                         <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
                         <button class="btn btn-secondary" id="sendTestMailButton"><?php echo lang('options_send_testmail'); ?></button>