diff --git a/invoice/src/main/java/com/ning/billing/invoice/notification/EmailInvoiceNotifier.java b/invoice/src/main/java/com/ning/billing/invoice/notification/EmailInvoiceNotifier.java
index 4a58ab3..27b9541 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/notification/EmailInvoiceNotifier.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/notification/EmailInvoiceNotifier.java
@@ -64,8 +64,7 @@ public class EmailInvoiceNotifier implements InvoiceNotifier {
throw new InvoiceApiException(e, ErrorCode.EMAIL_SENDING_FAILED);
}
- // TODO: get subject
- final String subject = "";
+ final String subject = config.getInvoiceEmailSubject();
final EmailSender sender = new DefaultEmailSender(config);
try {
diff --git a/util/src/main/java/com/ning/billing/util/email/EmailConfig.java b/util/src/main/java/com/ning/billing/util/email/EmailConfig.java
index 2d9a583..675b2ab 100644
--- a/util/src/main/java/com/ning/billing/util/email/EmailConfig.java
+++ b/util/src/main/java/com/ning/billing/util/email/EmailConfig.java
@@ -50,4 +50,8 @@ public interface EmailConfig extends KillbillConfig {
@Config("killbill.mail.useSSL")
@Default("false")
boolean useSSL();
+
+ @Config("killbill.mail.invoiceEmailSubject")
+ @Default("Your invoice")
+ String getInvoiceEmailSubject();
}