diff --git a/database.sql b/database.sql
index aa87247db3..7169847ba3 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2018-05-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1259
+-- Friendica 2018.05-rc (The Tazmans Flax-lily)
+-- DB_UPDATE_VERSION 1263
 -- ------------------------------------------
 
 
@@ -855,10 +855,12 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
 	`callback_url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`topic` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`push` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`push` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
+	`last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last successful trial',
+	`next_try` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date',
 	`secret` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	 PRIMARY KEY(`id`)
+	 PRIMARY KEY(`id`),
+	 INDEX `next_try` (`next_try`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --
@@ -1088,7 +1090,7 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 	 INDEX `pid` (`pid`),
 	 INDEX `parameter` (`parameter`(64)),
 	 INDEX `priority_created` (`priority`,`created`),
-	 INDEX `executed` (`executed`)
+	 INDEX `done_executed` (`done`,`executed`)
 ) DEFAULT COLLATE utf8mb4_general_ci;