diff --git a/radioconfig.proto b/radioconfig.proto
index 59429b9..ebe27fe 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -493,7 +493,10 @@ message RadioConfig {
      *FIXME - Move this out of UserPreferences and into a section for plugin configuration. (was 136)
      */
     bool store_forward_plugin_enabled = 148; 
+    bool store_forward_plugin_heartbeat = 149; 
     uint32 store_forward_plugin_records = 137;
+    uint32 store_forward_plugin_history_return_max = 138;
+    uint32 store_forward_plugin_history_return_window = 139;
     reserved 136;
 
     /*
diff --git a/store_and_forward.proto b/storeforward.proto
similarity index 86%
rename from store_and_forward.proto
rename to storeforward.proto
index ad61f61..662aa7d 100644
--- a/store_and_forward.proto
+++ b/storeforward.proto
@@ -12,8 +12,8 @@ option go_package = "github.com/meshtastic/gomeshproto";
 message StoreAndForwardMessage {
 
     /*
-     * 1 - 100 = From router
-     * 101-200 = From client
+     * 1   - 99  = From Router
+     * 101 - 199 = From Client
      */
     enum RequestResponse {
         /*
@@ -100,6 +100,22 @@ message StoreAndForwardMessage {
         */
         uint32 RequestsHistory = 6;
 
+        /*
+        * Is the heartbeat enabled on the server?
+        */
+        bool Heartbeat = 7;
+
+        /*
+        * Is the heartbeat enabled on the server?
+        */
+        uint32 ReturnMax = 8;
+
+        /*
+        * Is the heartbeat enabled on the server?
+        */
+        uint32 ReturnWindow = 9;
+
+
     }
 
     message History {