- CM_SetField(journal_msg, eAuthor, jmsg->from, strlen(jmsg->from));
- CM_SetField(journal_msg, eNodeName, jmsg->node, strlen(jmsg->node));
- CM_SetField(journal_msg, erFc822Addr, jmsg->rfca, strlen(jmsg->rfca));
- CM_SetField(journal_msg, eMsgSubject, jmsg->subj, strlen(jmsg->subj));
+
+ if (!IsEmptyStr(jmsg->from)) {
+ CM_SetField(journal_msg, eAuthor, jmsg->from, strlen(jmsg->from));
+ }
+
+ if (!IsEmptyStr(jmsg->node)) {
+ CM_SetField(journal_msg, eNodeName, jmsg->node, strlen(jmsg->node));
+ }
+
+ if (!IsEmptyStr(jmsg->rfca)) {
+ CM_SetField(journal_msg, erFc822Addr, jmsg->rfca, strlen(jmsg->rfca));
+ }
+
+ if (!IsEmptyStr(jmsg->subj)) {
+ CM_SetField(journal_msg, eMsgSubject, jmsg->subj, strlen(jmsg->subj));
+ }