---
 .../retail/sendemail/classes/OBSMAIL_MailSender.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/org/openbravo/retail/sendemail/classes/OBSMAIL_MailSender.java b/src/org/openbravo/retail/sendemail/classes/OBSMAIL_MailSender.java
index 4f11185..79f4594 100644
--- a/src/org/openbravo/retail/sendemail/classes/OBSMAIL_MailSender.java
+++ b/src/org/openbravo/retail/sendemail/classes/OBSMAIL_MailSender.java
@@ -224,8 +224,10 @@ public class OBSMAIL_MailSender {
           bp.getObsmailLanguage());
       if (emailTemplate != null) {
         if (subject != null) {
-          subject += " || ";
-          subject += emailTemplate.getSubject();
+          if (emailTemplate.getSubject() != null && !emailTemplate.getSubject().equals("")) {
+            subject += " || ";
+            subject += emailTemplate.getSubject();
+          }
         } else {
           subject = emailTemplate.getSubject();
         }
@@ -254,8 +256,10 @@ public class OBSMAIL_MailSender {
           bp.getObsmailLanguage());
       if (emailTemplate != null) {
         if (body != null) {
-          body += " || ";
-          body += emailTemplate.getBody();
+          if (emailTemplate.getBody() != null && !emailTemplate.getBody().equals("")) {
+            body += " || ";
+            body += emailTemplate.getBody();
+          }
         } else {
           body = emailTemplate.getBody();
         }
--