diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
index 2dc600fbcb..053eb8455a 100644
--- a/org.adempiere.base/src/org/compiere/model/MPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/MPayment.java
@@ -557,10 +557,15 @@ public final class MPayment extends X_C_Payment
 		StringBuffer msg = new StringBuffer();
 		if (approved)
 		{
-			msg.append("Result: " + getR_Result() + "\n");
-			msg.append("Response Message: " + getR_RespMsg() + "\n");
-			msg.append("Reference: " + getR_PnRef() + "\n");
-			msg.append("Authorization Code: " + getR_AuthCode() + "\n");
+			if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment))
+				msg.append(getR_VoidMsg() + "\n");
+			else
+			{
+				msg.append("Result: " + getR_Result() + "\n");
+				msg.append("Response Message: " + getR_RespMsg() + "\n");
+				msg.append("Reference: " + getR_PnRef() + "\n");
+				msg.append("Authorization Code: " + getR_AuthCode() + "\n");
+			}
 		}
 		else
 			msg.append("ERROR: " + getErrorMessage() + "\n");
diff --git a/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java b/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java
index cca70602a6..c5e751faa1 100644
--- a/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java
@@ -274,10 +274,15 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
 		StringBuffer msg = new StringBuffer();
 		if (approved)
 		{
-			msg.append("Result: " + getR_Result() + "\n");
-			msg.append("Response Message: " + getR_RespMsg() + "\n");
-			msg.append("Reference: " + getR_PnRef() + "\n");
-			msg.append("Authorization Code: " + getR_AuthCode() + "\n");
+			if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment))
+				msg.append(getR_VoidMsg() + "\n");
+			else
+			{
+				msg.append("Result: " + getR_Result() + "\n");
+				msg.append("Response Message: " + getR_RespMsg() + "\n");
+				msg.append("Reference: " + getR_PnRef() + "\n");
+				msg.append("Authorization Code: " + getR_AuthCode() + "\n");
+			}
 		}
 		else
 			msg.append("ERROR: " + getErrorMessage() + "\n");