diff --git a/rpg-docs/Model/Meta/Reports.js b/rpg-docs/Model/Meta/Reports.js
index f184f1fe..14505dce 100644
--- a/rpg-docs/Model/Meta/Reports.js
+++ b/rpg-docs/Model/Meta/Reports.js
@@ -50,7 +50,7 @@ Meteor.methods({
 			from: "reports@dicecloud.com",
 			to: "stefan.zermatten@gmail.com",
 			subject: "DiceCloud feedback - " + report.title,
-			text: JSON.stringify(report, null, '\t'),
+			text: JSON.stringify(_.omit(report, "metaData"), null, '\t'),
 		});
 	},
 	deleteReport: function(id) {
diff --git a/rpg-docs/client/views/feedback/feedback.html b/rpg-docs/client/views/feedback/feedback.html
index 1f9b095a..faba2274 100644
--- a/rpg-docs/client/views/feedback/feedback.html
+++ b/rpg-docs/client/views/feedback/feedback.html
@@ -25,6 +25,13 @@
 			</paper-autogrow-textarea>
 		</paper-input-decorator>
 	</div>
-	<paper-button id="cancelButton" affirmative>Cancel</paper-button>
-	<paper-button id="sendButton"   affirmative>Send  </paper-button>
+	<paper-button id="cancelButton"
+				  affirmative>
+		Cancel
+	</paper-button>
+	<paper-button id="sendButton"
+				  affirmative
+				  disabled={{invalid}}>
+		Send
+	</paper-button>
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/feedback/feedback.js b/rpg-docs/client/views/feedback/feedback.js
index e2cee72d..fd2ceb29 100644
--- a/rpg-docs/client/views/feedback/feedback.js
+++ b/rpg-docs/client/views/feedback/feedback.js
@@ -1,4 +1,23 @@
+Template.feedback.onCreated(function() {
+	this.title = new ReactiveVar("");
+	this.description = new ReactiveVar("");
+});
+
+Template.feedback.helpers({
+	invalid: function() {
+		var inst = Template.instance();
+		return !inst.title.get() ||
+			!inst.description.get();
+	}
+});
+
 Template.feedback.events({
+	"input #feedbackTitle": function(event, instance) {
+		instance.title.set(instance.find("#feedbackTitle").value);
+	},
+	"input #feedbackDescription": function(event, instance) {
+		instance.description.set(instance.find("#feedbackDescription").value);
+	},
 	"tap #sendButton": function(event, instance) {
 		var report = {};
 		report.title = instance.find("#feedbackTitle").value;