diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
index 4375c081d55722b4a90ddfbf898c0ac54c68b8b4..987e6c86f5d40a29ed01dafbe747fa83a6c17277 100644
--- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -242,7 +242,7 @@ class IMipPlugin extends SabreIMipPlugin {
 
 
 		// Only add response buttons to invitation requests: Fix Issue #11230
-		if ($method == self::METHOD_REQUEST) {
+		if (($method == self::METHOD_REQUEST) && $this->getAttendeeRSVP($attendee)) {
 
 			/*
 			** Only offer invitation accept/reject buttons, which link back to the
@@ -380,6 +380,21 @@ class IMipPlugin extends SabreIMipPlugin {
 		return $default;
 	}
 
+	/**
+	 * @param Property|null $attendee
+	 * @return bool
+	 */
+	private function getAttendeeRSVP(Property $attendee = null) {
+		if ($attendee !== null) {
+			$rsvp = $attendee->offsetGet('RSVP');
+			if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
+				return true;
+			}
+		}
+		// RFC 5545 3.2.17: default RSVP is false
+		return false;
+	}
+
 	/**
 	 * @param IL10N $l10n
 	 * @param Property $dtstart
@@ -538,7 +553,7 @@ class IMipPlugin extends SabreIMipPlugin {
 			$moreOptionsURL, $l10n->t('More options …')
 		]);
 		$text = $l10n->t('More options at %s', [$moreOptionsURL]);
-		
+
 		$template->addBodyText($html, $text);
 	}