Resolved a few FIXME's and fixed a comment typo

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java

@@ -2493,7 +2493,6 @@ public DkimConfig getDkimConfig() {
 	 */
 	@Override
 	@Nullable
-	// FIXME what's the point of these useXXX methods?
 	public Boolean getUseDispositionNotificationTo() {
 		return useDispositionNotificationTo;
 	}

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/EmailGovernanceImpl.java

@@ -109,12 +109,10 @@ public static EmailGovernance NO_GOVERNANCE() {
 	 */
 	@Nullable private final Integer maximumEmailSize;
 
-	// FIXME get rid of all the default properties in Email and move them to EmailDefaults
 	public EmailGovernanceImpl(@Nullable EmailValidator emailValidator, @Nullable Email emailDefaults, @Nullable Email emailOverrides, @Nullable Integer maximumEmailSize) {
 		this.emailValidator = emailValidator;
 		this.emailDefaults = emailDefaults != null ? emailDefaults : newDefaultsEmailWithDefaultDefaults();
-		// FIXME ignoringDefaults should go away as defaults are moved out of the Email constructor / edit: ignoringDefaults still has merit for the email builder
-		this.emailOverrides = emailOverrides != null ? emailOverrides : EmailBuilder.ignoringDefaults().startingBlank().buildEmail();
+		this.emailOverrides = emailOverrides != null ? emailOverrides : EmailBuilder.startingBlank().buildEmail();
 		this.maximumEmailSize = maximumEmailSize;
 	}
 
@@ -243,19 +241,16 @@ public EmailWithDefaultsAndOverridesApplied produceEmailApplyingDefaultsAndOverr
 	}
 
 	@Nullable
-	// FIXME This shouldn't be called anymore, since an Email should just be completed by EmailGovernance and then _its_ already resolved properties should be used instead
 	private <T> T resolveEmailProperty(@Nullable Email email, @NotNull EmailProperty emailProperty) {
 		return overrideOrProvideOrDefaultProperty(email, emailDefaults, emailOverrides, emailProperty);
 	}
 
 	@NotNull
-	// FIXME same as above
 	private <T> List<T> resolveEmailCollectionProperty(@Nullable Email email, @NotNull EmailProperty emailProperty) {
 		return overrideAndOrProvideAndOrDefaultCollection(email, emailDefaults, emailOverrides, emailProperty);
 	}
 
 	@NotNull
-	// FIXME same as above
 	private Map<String, Collection<String>> resolveEmailHeadersProperty(@Nullable Email email) {
 		return overrideAndOrProvideAndOrDefaultHeaders(email, emailDefaults, emailOverrides);
 	}

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerLiveTest.java

@@ -389,7 +389,7 @@ private Email assertSendingEmail(final EmailPopulatingBuilder originalEmailPopul
 		}
 
 		Email receivedEmail = mimeMessageToEmailBuilder(receivedMimeMessage.getMimeMessage(), loadPkcs12KeyStore())
-				.ignoringDefaults(false) // FIXME perhpas we should make this default, when converting a MimeMessage to an Email?
+				.ignoringDefaults(false) // FIXME perhaps we should make this default, when converting a MimeMessage to an Email?
 				.buildEmail();
 
 		if (!sentDateWasFixed) {