Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -1048,4 +1049,4 @@ public void setSmime(OutlookSmime smime) {
public OutlookSmime getSmime() {
return smime;
}
}
}