Index: UserMailer.php
===================================================================
--- UserMailer.php	(revision 83374)
+++ UserMailer.php	(working copy)
@@ -335,14 +335,16 @@
 	 * @param $oldid (default: false)
 	 */
 	public function notifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid = false ) {
-		global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker;
+		global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker, $wgEnotifMinorEdits;
 
 		if ( $title->getNamespace() < 0 )
 			return;
 
 		// Build a list of users to notfiy
 		$watchers = array();
-		if ( $wgEnotifWatchlist || $wgShowUpdatedMarker ) {
+		if ( ($wgEnotifWatchlist || $wgShowUpdatedMarker )
+			&& ( !$minorEdit || $wgEnotifMinorEdits )
+		) {
 			$dbw = wfGetDB( DB_MASTER );
 			$res = $dbw->select( array( 'watchlist' ),
 				array( 'wl_user' ),