diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bf49107b756..394e7ba708b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -229,8 +229,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Patch from LeonWP: added UploadForm:BeforeProcessing hook in SpecialUpload.php
 * Add AuthPluginSetup hook to override $wgAuth after configuration
 * Fix regression in authentication hook auto-creation on login
-* (bug 8110) Allow spaces in ISBNs.
-
+* (bug 8110) Allow spaces in ISBNs
+* (bug 8024) Introduce "send me copies of emails I send to others" preference
 
 == Languages updated ==
 
diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 16270b17783..38745a37085 100644
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -123,7 +123,7 @@ class EmailUserForm {
 <span id='wpTextLabel'><label for=\"wpText\">{$emm}:</label><br /></span>
 <textarea name=\"wpText\" rows='20' cols='80' wrap='virtual' style=\"width: 100%;\">" . htmlspecialchars( $this->text ) .
 "</textarea>
-" . wfCheckLabel( $emc, 'wpCCMe', 'wpCCMe' ) . "<br />
+" . wfCheckLabel( $emc, 'wpCCMe', 'wpCCMe', $wgUser->getBoolOption( 'ccmeonemails' ) ) . "<br />
 <input type='submit' name=\"wpSend\" value=\"{$ems}\" />
 <input type='hidden' name='wpEditToken' value=\"$token\" />
 </form>\n" );
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 39f2fc57b48..29614a80891 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -486,6 +486,7 @@ class PreferencesForm {
 		$this->mUsedToggles[ 'enotifusertalkpages' ] = true;
 		$this->mUsedToggles[ 'enotifminoredits' ] = true;
 		$this->mUsedToggles[ 'enotifrevealaddr' ] = true;
+		$this->mUsedToggles[ 'ccmeonemails' ] = true;
 		$this->mUsedToggles[ 'uselivepreview' ] = true;
 
 		# Enotif
@@ -688,6 +689,7 @@ class PreferencesForm {
 				$wgOut->addHTML(
 				"<div><input type='checkbox' $emfc $disabled value='1' name='wpEmailFlag' id='wpEmailFlag' /> <label for='wpEmailFlag'>$emf</label></div>" );
 			}
+			$wgOut->addHtml( $this->getToggle( 'ccmeonemails' ) );
 
 			$wgOut->addHTML( '</fieldset>' );
 		}
diff --git a/includes/User.php b/includes/User.php
index ea05f6af478..73742f510b9 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -56,6 +56,7 @@ class User {
 		'forceeditsummary',
 		'watchlisthideown',
 		'watchlisthidebots',
+		'ccmeonemails',
 	);
 
 	/**
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2ff707c7264..5e7a573f749 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -481,6 +481,7 @@ parent class in order maintain consistency across languages.
 'tog-watchlisthideown' => 'Hide my edits from the watchlist',
 'tog-watchlisthidebots' => 'Hide bot edits from the watchlist',
 'tog-nolangconversion'		=> 'Disable variants conversion',
+'tog-ccmeonemails' => 'Send me copies of emails I send to other users',
 
 'underline-always' => 'Always',
 'underline-never' => 'Never',