diff --git a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java
index 9b10364..bc0bf28 100644
--- a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java
+++ b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java
@@ -201,9 +201,10 @@ public void setProperty(final OutlookMessageProperty msgProp, RTF2HTMLConverter
 				break;
 			case 0xc1f: //SENDER EMAIL ADDRESS
 			case 0x65: //SENT REPRESENTING EMAIL ADDRESS
-			case 0x3ffa: //LAST MODIFIER NAME
 				setFromEmail(stringValue);
 				break;
+			case 0x3ffa: //LAST MODIFIER NAME
+				break;
 			case 0x42: //SENT REPRESENTING NAME
 				setFromName(stringValue);
 				break;
@@ -527,7 +528,7 @@ private void setFromEmail(final String fromEmail) {
 	 * @param force     forces overwriting of the field if already set
 	 */
 	private void setFromEmail(final String fromEmail, final boolean force) {
-		if ((force || this.fromEmail == null) && fromEmail != null && fromEmail.contains("@")) {
+		if (force || this.fromEmail == null) {
 			this.fromEmail = fromEmail;
 		}
 	}
@@ -1048,4 +1049,4 @@ public void setSmime(OutlookSmime smime) {
 	public OutlookSmime getSmime() {
 		return smime;
 	}
-}
\ No newline at end of file
+}