diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index d45c733e69..303850d9d9 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -96,6 +96,8 @@ class Conversation
 	private $session;
 	/** @var Repository\UserGServer */
 	private $userGServer;
+	/** @var Array */
+	private $blockList;
 
 	public function __construct(Repository\UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app, IHandleUserSessions $session)
 	{
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 59918287ab..a9ba52dcd0 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3259,7 +3259,9 @@ class Diaspora
 		/// @todo - establish "all day" events in Friendica
 		$eventdata['all_day'] = 'false';
 
-		$eventdata['timezone'] = 'UTC';
+		// @todo Should be user timezone - but only if the event is supposed to be displayed
+		// in that specific timezone and not the user's timezone.
+		// $eventdata['timezone'] = 'UTC';
 
 		if ($event['start']) {
 			$eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
@@ -3403,8 +3405,7 @@ class Diaspora
 			if ($item['event-id'] > 0) {
 				$event = self::buildEvent($item['event-id']);
 				if (count($event)) {
-					// Deactivated, since Diaspora seems to have problems with the processing.
-					// $message['event'] = $event;
+					$message['event'] = $event;
 
 					if (
 						!empty($event['location']['address']) &&