diff --git a/distribution/src/database/openfire_db2.sql b/distribution/src/database/openfire_db2.sql
index 3a686b521a..f64595f230 100644
--- a/distribution/src/database/openfire_db2.sql
+++ b/distribution/src/database/openfire_db2.sql
@@ -395,14 +395,35 @@ CREATE TABLE ofPubsubDefaultConf (
   CONSTRAINT ofPubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
+CREATE TABLE ofSpamReport (
+  reportID            BIGINT        NOT NULL,
+  reporter            VARCHAR(1024) NOT NULL,
+  reported            VARCHAR(1024) NOT NULL,
+  reason              VARCHAR(255)  NOT NULL,
+  created             BIGINT        NOT NULL,
+  context             LONG VARCHAR  NULL,
+  CONSTRAINT ofSpamReport PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+  reportID            INTEGER       NOT NULL,
+  stanzaIDValue       VARCHAR(1024) NOT NULL,
+  stanzaIDBy          VARCHAR(1024) NOT NULL,
+  stanza              LONG VARCHAR  NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
 -- Finally, insert default table values
 INSERT INTO ofID (idType, id) VALUES (18, 1);
 INSERT INTO ofID (idType, id) VALUES (19, 1);
 INSERT INTO ofID (idType, id) VALUES (23, 1);
 INSERT INTO ofID (idType, id) VALUES (26, 2);
 INSERT INTO ofID (idType, id) VALUES (27, 1);
+INSERT INTO ofID (idType, id) VALUES (42, 1);
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36);
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37);
 
 -- Entry for admin user
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/openfire_hsqldb.sql b/distribution/src/database/openfire_hsqldb.sql
index 97e4cabe4a..2624d09867 100644
--- a/distribution/src/database/openfire_hsqldb.sql
+++ b/distribution/src/database/openfire_hsqldb.sql
@@ -381,6 +381,26 @@ CREATE TABLE ofPubsubDefaultConf (
   CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
+CREATE TABLE ofSpamReport (
+    reportID          BIGINT        NOT NULL,
+    reporter          VARCHAR(1024) NOT NULL,
+    reported          VARCHAR(1024) NOT NULL,
+    reason            VARCHAR(255)  NOT NULL,
+    created           BIGINT        NOT NULL,
+    context           LONGVARCHAR   NULL,
+    CONSTRAINT ofSpamReport PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+    reportID          BIGINT        NOT NULL,
+    stanzaIDValue     VARCHAR(1024) NOT NULL,
+    stanzaIDBy        VARCHAR(1024) NOT NULL,
+    stanza            LONGVARCHAR   NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
 // Finally, insert default table values.
 
 INSERT INTO ofID (idType, id) VALUES (18, 1);
@@ -388,8 +408,9 @@ INSERT INTO ofID (idType, id) VALUES (19, 1);
 INSERT INTO ofID (idType, id) VALUES (23, 1);
 INSERT INTO ofID (idType, id) VALUES (26, 2);
 INSERT INTO ofID (idType, id) VALUES (27, 1);
+INSERT INTO ofID (idType, id) VALUES (42, 1);
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36);
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37);
 
 // Entry for admin user
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/openfire_mysql.sql b/distribution/src/database/openfire_mysql.sql
index 07e9f26f13..d55569f238 100644
--- a/distribution/src/database/openfire_mysql.sql
+++ b/distribution/src/database/openfire_mysql.sql
@@ -371,6 +371,26 @@ CREATE TABLE ofPubsubDefaultConf (
   PRIMARY KEY (serviceID, leaf)
 );
 
+CREATE TABLE ofSpamReport (
+  reportID            BIGINT        NOT NULL,
+  reporter            VARCHAR(1024) NOT NULL,
+  reported            VARCHAR(1024) NOT NULL,
+  reason              VARCHAR(255)  NOT NULL,
+  created             BIGINT        NOT NULL,
+  context             TEXT          NULL,
+  PRIMARY KEY (reportID),
+  INDEX ofSpamReport_created_reporter_id (created, reporter),
+  INDEX ofSpamReport_created_reported_id (created, reported)
+);
+
+CREATE TABLE ofSpamStanza (
+  reportID            BIGINT        NOT NULL,
+  stanzaIDValue       VARCHAR(1024) NOT NULL,
+  stanzaIDBy          VARCHAR(1024) NOT NULL,
+  stanza              TEXT          NULL,
+  INDEX ofSpamStanza_reportID (reportID)
+);
+
 # Finally, insert default table values.
 
 INSERT INTO ofID (idType, id) VALUES (18, 1);
@@ -378,8 +398,9 @@ INSERT INTO ofID (idType, id) VALUES (19, 1);
 INSERT INTO ofID (idType, id) VALUES (23, 1);
 INSERT INTO ofID (idType, id) VALUES (26, 2);
 INSERT INTO ofID (idType, id) VALUES (27, 1);
+INSERT INTO ofID (idType, id) VALUES (42, 1);
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36);
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37);
 
 # Entry for admin user
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/openfire_oracle.sql b/distribution/src/database/openfire_oracle.sql
index 61863ffb4a..4a6935680c 100644
--- a/distribution/src/database/openfire_oracle.sql
+++ b/distribution/src/database/openfire_oracle.sql
@@ -379,6 +379,26 @@ CREATE TABLE ofPubsubDefaultConf (
   CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
+CREATE TABLE ofSpamReport (
+  reportID            INTEGER        NOT NULL,
+  reporter            VARCHAR2(1024) NOT NULL,
+  reported            VARCHAR2(1024) NOT NULL,
+  reason              VARCHAR2(255)  NOT NULL,
+  created             INTEGER        NOT NULL,
+  context             CLOB           NULL,
+  CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+  reportID            INTEGER        NOT NULL,
+  stanzaIDValue       VARCHAR2(1024) NOT NULL,
+  stanzaIDBy          VARCHAR2(1024) NOT NULL,
+  stanza              CLOB           NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
 -- Finally, insert default table values.
 
 INSERT INTO ofID (idType, id) VALUES (18, 1);
@@ -386,8 +406,9 @@ INSERT INTO ofID (idType, id) VALUES (19, 1);
 INSERT INTO ofID (idType, id) VALUES (23, 1);
 INSERT INTO ofID (idType, id) VALUES (26, 2);
 INSERT INTO ofID (idType, id) VALUES (27, 1);
+INSERT INTO ofID (idType, id) VALUES (42, 1);
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36);
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37);
 
 -- Entry for admin user
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/openfire_postgresql.sql b/distribution/src/database/openfire_postgresql.sql
index 130eddf2f7..3fd78a4b51 100644
--- a/distribution/src/database/openfire_postgresql.sql
+++ b/distribution/src/database/openfire_postgresql.sql
@@ -387,6 +387,26 @@ CREATE TABLE ofPubsubDefaultConf (
   CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
+CREATE TABLE ofSpamReport (
+  reportID            BIGINT        NOT NULL,
+  reporter            VARCHAR(1024) NOT NULL,
+  reported            VARCHAR(1024) NOT NULL,
+  reason              VARCHAR(255)  NOT NULL,
+  created             BIGINT        NOT NULL,
+  context             TEXT          NULL,
+  CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+  reportID            BIGINT        NOT NULL,
+  stanzaIDValue       VARCHAR(1024) NOT NULL,
+  stanzaIDBy          VARCHAR(1024) NOT NULL,
+  stanza              TEXT          NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
 -- Finally, insert default table values.
 
 INSERT INTO ofID (idType, id) VALUES (18, 1);
@@ -394,8 +414,9 @@ INSERT INTO ofID (idType, id) VALUES (19, 1);
 INSERT INTO ofID (idType, id) VALUES (23, 1);
 INSERT INTO ofID (idType, id) VALUES (26, 2);
 INSERT INTO ofID (idType, id) VALUES (27, 1);
+INSERT INTO ofID (idType, id) VALUES (42, 1);
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36);
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37);
 
 -- Entry for admin user
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/openfire_sqlserver.sql b/distribution/src/database/openfire_sqlserver.sql
index 663c5ee71f..27b8267cde 100644
--- a/distribution/src/database/openfire_sqlserver.sql
+++ b/distribution/src/database/openfire_sqlserver.sql
@@ -384,6 +384,26 @@ CREATE TABLE ofPubsubDefaultConf (
   CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
+CREATE TABLE ofSpamReport (
+  reportID            BIGINT        NOT NULL,
+  reporter            VARCHAR(1024) NOT NULL,
+  reported            VARCHAR(1024) NOT NULL,
+  reason              VARCHAR(255)  NOT NULL,
+  created             BIGINT        NOT NULL,
+  context             NVARCHAR(MAX) NULL,
+  CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+  reportID            BIGINT        NOT NULL,
+  stanzaIDValue       VARCHAR(1024) NOT NULL,
+  stanzaIDBy          VARCHAR(1024) NOT NULL,
+  stanza              NVARCHAR(MAX) NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
 /* Finally, insert default table values. */
 
 INSERT INTO ofID (idType, id) VALUES (18, 1);
@@ -391,8 +411,9 @@ INSERT INTO ofID (idType, id) VALUES (19, 1);
 INSERT INTO ofID (idType, id) VALUES (23, 1);
 INSERT INTO ofID (idType, id) VALUES (26, 2);
 INSERT INTO ofID (idType, id) VALUES (27, 1);
+INSERT INTO ofID (idType, id) VALUES (42, 1);
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36);
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37);
 
 /* Entry for admin user */
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/openfire_sybase.sql b/distribution/src/database/openfire_sybase.sql
index bb4cb4de09..69ea62c61d 100644
--- a/distribution/src/database/openfire_sybase.sql
+++ b/distribution/src/database/openfire_sybase.sql
@@ -384,6 +384,26 @@ CREATE TABLE ofPubsubDefaultConf (
   CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf)
 )
 
+CREATE TABLE ofSpamReport (
+  reportID            INTEGER        NOT NULL,
+  reporter            NVARCHAR(1024) NOT NULL,
+  reported            NVARCHAR(1024) NOT NULL,
+  reason              NVARCHAR(255)  NOT NULL,
+  created             INTEGER        NOT NULL,
+  context             LONG VARCHAR   NULL,
+  CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+)
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter)
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported)
+
+CREATE TABLE ofSpamStanza (
+  reportID            INTEGER        NOT NULL,
+  stanzaIDValue       NVARCHAR(1024) NOT NULL,
+  stanzaIDBy          NVARCHAR(1024) NOT NULL,
+  stanza              LONG VARCHAR   NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
 /* Finally, insert default table values. */
 
 INSERT INTO ofID (idType, id) VALUES (18, 1)
@@ -391,8 +411,9 @@ INSERT INTO ofID (idType, id) VALUES (19, 1)
 INSERT INTO ofID (idType, id) VALUES (23, 1)
 INSERT INTO ofID (idType, id) VALUES (26, 2)
 INSERT INTO ofID (idType, id) VALUES (27, 1)
+INSERT INTO ofID (idType, id) VALUES (42, 1)
 
-INSERT INTO ofVersion (name, version) VALUES ('openfire', 36)
+INSERT INTO ofVersion (name, version) VALUES ('openfire', 37)
 
 /* Entry for admin user */
 INSERT INTO ofUser (username, plainPassword, name, email, creationDate, modificationDate)
diff --git a/distribution/src/database/upgrade/37/openfire_db2.sql b/distribution/src/database/upgrade/37/openfire_db2.sql
new file mode 100644
index 0000000000..d5cec2dfa4
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_db2.sql
@@ -0,0 +1,24 @@
+CREATE TABLE ofSpamReport (
+    reportID INTEGER       NOT NULL,
+    reporter VARCHAR(1024) NOT NULL,
+    reported VARCHAR(1024) NOT NULL,
+    reason   VARCHAR(255)  NOT NULL,
+    created  BIGINT        NOT NULL,
+    context  LONG VARCHAR  NULL,
+    CONSTRAINT ofSpamReport PRIMARY KEY (reportID)
+);
+
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+    reportID      INTEGER       NOT NULL,
+    stanzaIDValue VARCHAR(1024) NOT NULL,
+    stanzaIDBy    VARCHAR(1024) NOT NULL,
+    stanza        LONG VARCHAR  NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/distribution/src/database/upgrade/37/openfire_hsqldb.sql b/distribution/src/database/upgrade/37/openfire_hsqldb.sql
new file mode 100644
index 0000000000..4518956ecd
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_hsqldb.sql
@@ -0,0 +1,23 @@
+CREATE TABLE ofSpamReport (
+    reportID BIGINT        NOT NULL,
+    reporter VARCHAR(1024) NOT NULL,
+    reported VARCHAR(1024) NOT NULL,
+    reason   VARCHAR(255)  NOT NULL,
+    created  BIGINT        NOT NULL,
+    context  LONGVARCHAR   NULL,
+    CONSTRAINT ofSpamReport PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+    reportID      BIGINT        NOT NULL,
+    stanzaIDValue VARCHAR(1024) NOT NULL,
+    stanzaIDBy    VARCHAR(1024) NOT NULL,
+    stanza        LONGVARCHAR   NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/distribution/src/database/upgrade/37/openfire_mysql.sql b/distribution/src/database/upgrade/37/openfire_mysql.sql
new file mode 100644
index 0000000000..1d00c95d6c
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_mysql.sql
@@ -0,0 +1,23 @@
+CREATE TABLE ofSpamReport (
+    reportID BIGINT        NOT NULL,
+    reporter VARCHAR(1024) NOT NULL,
+    reported VARCHAR(1024) NOT NULL,
+    reason   VARCHAR(255)  NOT NULL,
+    created  BIGINT        NOT NULL,
+    context  TEXT          NULL,
+    PRIMARY KEY (reportID),
+    INDEX ofSpamReport_created_reporter_id (created, reporter),
+    INDEX ofSpamReport_created_reported_id (created, reported)
+);
+
+CREATE TABLE ofSpamStanza (
+    reportID      BIGINT        NOT NULL,
+    stanzaIDValue VARCHAR(1024) NOT NULL,
+    stanzaIDBy    VARCHAR(1024) NOT NULL,
+    stanza        TEXT          NULL,
+    INDEX ofSpamStanza_reportID (reportID)
+);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/distribution/src/database/upgrade/37/openfire_oracle.sql b/distribution/src/database/upgrade/37/openfire_oracle.sql
new file mode 100644
index 0000000000..ee2e090a11
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_oracle.sql
@@ -0,0 +1,23 @@
+CREATE TABLE ofSpamReport (
+    reportID INTEGER        NOT NULL,
+    reporter VARCHAR2(1024) NOT NULL,
+    reported VARCHAR2(1024) NOT NULL,
+    reason   VARCHAR2(255)  NOT NULL,
+    created  INTEGER        NOT NULL,
+    context  CLOB           NULL,
+    CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+    reportID      INTEGER        NOT NULL,
+    stanzaIDValue VARCHAR2(1024) NOT NULL,
+    stanzaIDBy    VARCHAR2(1024) NOT NULL,
+    stanza        CLOB           NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/distribution/src/database/upgrade/37/openfire_postgresql.sql b/distribution/src/database/upgrade/37/openfire_postgresql.sql
new file mode 100644
index 0000000000..a71db9b6f5
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_postgresql.sql
@@ -0,0 +1,23 @@
+CREATE TABLE ofSpamReport (
+    reportID BIGINT        NOT NULL,
+    reporter VARCHAR(1024) NOT NULL,
+    reported VARCHAR(1024) NOT NULL,
+    reason   VARCHAR(255)  NOT NULL,
+    created  BIGINT        NOT NULL,
+    context  TEXT          NULL,
+    CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+  reportID      BIGINT        NOT NULL,
+  stanzaIDValue VARCHAR(1024) NOT NULL,
+  stanzaIDBy    VARCHAR(1024) NOT NULL,
+  stanza        TEXT          NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/distribution/src/database/upgrade/37/openfire_sqlserver.sql b/distribution/src/database/upgrade/37/openfire_sqlserver.sql
new file mode 100644
index 0000000000..20d40173fb
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_sqlserver.sql
@@ -0,0 +1,23 @@
+CREATE TABLE ofSpamReport (
+    reportID BIGINT        NOT NULL,
+    reporter VARCHAR(1024) NOT NULL,
+    reported VARCHAR(1024) NOT NULL,
+    reason   VARCHAR(255)  NOT NULL,
+    created  BIGINT        NOT NULL,
+    context  NVARCHAR(MAX) NULL,
+    CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+    reportID      BIGINT        NOT NULL,
+    stanzaIDValue VARCHAR(1024) NOT NULL,
+    stanzaIDBy    VARCHAR(1024) NOT NULL,
+    stanza        NVARCHAR(MAX) NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/distribution/src/database/upgrade/37/openfire_sybase.sql b/distribution/src/database/upgrade/37/openfire_sybase.sql
new file mode 100644
index 0000000000..1a969ee26a
--- /dev/null
+++ b/distribution/src/database/upgrade/37/openfire_sybase.sql
@@ -0,0 +1,23 @@
+CREATE TABLE ofSpamReport (
+    reportID INTEGER        NOT NULL,
+    reporter NVARCHAR(1024) NOT NULL,
+    reported NVARCHAR(1024) NOT NULL,
+    reason   NVARCHAR(255)  NOT NULL,
+    created  INTEGER        NOT NULL,
+    context  LONG VARCHAR   NULL,
+    CONSTRAINT ofSpamReport_pk PRIMARY KEY (reportID)
+);
+CREATE INDEX ofSpamReport_created_reporter_id ON ofSpamReport (created, reporter);
+CREATE INDEX ofSpamReport_created_reported_id ON ofSpamReport (created, reported);
+
+CREATE TABLE ofSpamStanza (
+    reportID      INTEGER        NOT NULL,
+    stanzaIDValue NVARCHAR(1024) NOT NULL,
+    stanzaIDBy    NVARCHAR(1024) NOT NULL,
+    stanza        LONG VARCHAR   NULL
+);
+CREATE INDEX ofSpamStanza_reportID ON ofSpamStanza (reportID);
+
+INSERT INTO ofID (idType, id) VALUES (42, 1);
+
+UPDATE ofVersion SET version = 37 WHERE name = 'openfire';
diff --git a/documentation/database-guide.html b/documentation/database-guide.html
index a44829bd13..9d55abbec5 100644
--- a/documentation/database-guide.html
+++ b/documentation/database-guide.html
@@ -86,10 +86,10 @@ <h2>Database Tables</h2>
                 <li><a href="#ofExtComponentConf">ofExtComponentConf</a></li>
                 <li><a href="#ofRemoteServerConf">ofRemoteServerConf</a></li>
                 <li><a href="#ofSecurityAuditLog">ofSecurityAuditLog</a></li>
+
                 <li><a href="#ofMucService">ofMucService</a></li>
                 <li><a href="#ofMucServiceProp">ofMucServiceProp</a></li>
                 <li><a href="#ofMucRoom">ofMucRoom</a></li>
-
                 <li><a href="#ofMucRoomProp">ofMucRoomProp</a></li>
                 <li><a href="#ofMucRoomRetiree">ofMucRoomRetiree</a></li>
                 <li><a href="#ofMucAffiliation">ofMucAffiliation</a></li>
@@ -101,9 +101,11 @@ <h2>Database Tables</h2>
                 <li><a href="#ofPubsubNodeGroups">ofPubsubNodeGroups</a></li>
                 <li><a href="#ofPubsubAffiliation">ofPubsubAffiliation</a></li>
                 <li><a href="#ofPubsubItem">ofPubsubItem</a></li>
-
                 <li><a href="#ofPubsubSubscription">ofPubsubSubscription</a></li>
                 <li><a href="#ofPubsubDefaultConf">ofPubsubDefaultConf</a></li>
+
+                <li><a href="#ofSpamReport">ofSpamReport</a></li>
+                <li><a href="#ofSpamStanza">ofSpamStanza</a></li>
             </ul>
         </nav>
 
@@ -1802,6 +1804,100 @@ <h2>Database Tables</h2>
 
         &nbsp;<a href="#top" class="top">top of page</a>
 
+        <table id="ofSpamReport" class="dbtable">
+            <tbody>
+            <tr>
+                <th colspan="4">ofSpamReport (spam rapportage)</th>
+            </tr>
+            <tr>
+                <th>Column Name</th>
+                <th>Type</th>
+                <th>Length</th>
+                <th>Description</th>
+            </tr>
+            <tr class="primary-key">
+                <td>reportID</td>
+                <td>NUMBER</td>
+                <td></td>
+                <td>Unique identifier for the report</td>
+            </tr>
+            <tr>
+                <td>reporter</td>
+                <td>VARCHAR</td>
+                <td>1024</td>
+                <td>JID of entity that is reporting the spam</td>
+            </tr>
+            <tr>
+                <td>reported</td>
+                <td>VARCHAR</td>
+                <td>1024</td>
+                <td>JID of entity that is being reported (the 'offender')</td>
+            </tr>
+            <tr>
+                <td>reason</td>
+                <td>VARCHAR</td>
+                <td>255</td>
+                <td>Identifier (typically a namespace) for the type of spam report</td>
+            </tr>
+            <tr>
+                <td>created</td>
+                <td>NUMBER</td>
+                <td></td>
+                <td>Epoch millis of the creation time of the report</td>
+            </tr>
+            <tr>
+                <td>context</td>
+                <td>CLOB</td>
+                <td></td>
+                <td>Textual / human readable context</td>
+            </tr>
+            </tbody>
+
+            &nbsp;<a href="#top" class="top">top of page</a>
+
+        </table>
+
+        <table id="ofSpamStanza" class="dbtable">
+            <tbody>
+            <tr>
+                <th colspan="4">ofSpamStanza (one stanza that has been reported as being spam)</th>
+            </tr>
+            <tr>
+                <th>Column Name</th>
+                <th>Type</th>
+                <th>Length</th>
+                <th>Description</th>
+            </tr>
+            <tr>
+                <td>reportID</td>
+                <td>NUMBER</td>
+                <td></td>
+                <td>foreign key to the owning row in ofSpamReport</td>
+            </tr>
+            <tr>
+                <td>stanzaIDValue</td>
+                <td>VARCHAR</td>
+                <td>1024</td>
+                <td>The 'id' attribute value of a stanzaID referencing the reported stanza.</td>
+            </tr>
+            <tr>
+                <td>stanzaIDBy</td>
+                <td>VARCHAR</td>
+                <td>1024</td>
+                <td>The JID that is the 'by' attribute value of a stanza ID referencing the reported stanza.</td>
+            </tr>
+            <tr>
+                <td>stanza</td>
+                <td>CLOB</td>
+                <td></td>
+                <td>XML representation of the reported stanza (if provided)</td>
+            </tr>
+            </tbody>
+
+            &nbsp;<a href="#top" class="top">top of page</a>
+
+        </table>
+
     </section>
 
     <footer>
diff --git a/documentation/openfire.doap b/documentation/openfire.doap
index 6bbd54ff16..b6e56630d8 100644
--- a/documentation/openfire.doap
+++ b/documentation/openfire.doap
@@ -458,5 +458,12 @@
                 <xmpp:note xml:lang='en'>Implements most features, except for much of the Destination Address Selection as defined in RFC 6724, Section 6.</xmpp:note>
             </xmpp:SupportedXep>
         </implements>
+        <implements>
+            <xmpp:SupportedXep>
+                <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html"/>
+                <xmpp:status>complete</xmpp:status>
+                <xmpp:version>0.3.1</xmpp:version>
+            </xmpp:SupportedXep>
+        </implements>
     </Project>
 </rdf:RDF>
diff --git a/documentation/protocol-support.html b/documentation/protocol-support.html
index b369155161..212141ccb2 100644
--- a/documentation/protocol-support.html
+++ b/documentation/protocol-support.html
@@ -406,6 +406,8 @@ <h2>List of other XEPs Supported</h2>
                 <td><a href="https://www.xmpp.org/extensions/xep-0289.html">XEP-0289</a>: Federated MUC for Constrained Environments</td>
             </tr><tr>
                 <td><a href="https://www.xmpp.org/extensions/xep-0321.html">XEP-0321</a>: Remote Roster Management [<a href="#fn15">15</a>]</td>
+            </tr><tr>
+                <td><a href="https://www.xmpp.org/extensions/xep-0337.html">XEP-0337</a>: Spam Reporting</td>
             </tr><tr>
                 <td><a href="https://www.xmpp.org/extensions/xep-0359.html">XEP-0359</a>: Unique and Stable Stanza IDs</td>
             </tr><tr>
diff --git a/i18n/src/main/resources/openfire_i18n.properties b/i18n/src/main/resources/openfire_i18n.properties
index fc3713ccc8..824492192b 100644
--- a/i18n/src/main/resources/openfire_i18n.properties
+++ b/i18n/src/main/resources/openfire_i18n.properties
@@ -58,6 +58,8 @@ tab.server.descr=Click to manage server settings
         sidebar.server-sms.descr=Click to configure SMS settings
         sidebar.security-audit-viewer=Security Audit Viewer
         sidebar.security-audit-viewer.descr=Click to view the security audit logs
+        sidebar.spam-report-viewer=Spam Report Viewer
+        sidebar.spam-report-viewer.descr=Click to view reported spam
     sidebar.sidebar-server-settings=Server Settings
         sidebar.profile-settings=Profile Settings
         sidebar.profile-settings.descr=Click to configure user and group profile settings
@@ -1347,6 +1349,7 @@ system_property.provider.lockout.className=The class to use to lock-out Openfire
 system_property.provider.pubsub-persistence.className=The class used to persist pubsub data.
 system_property.provider.pubsub-persistence.caching.delegate-className=The class used by the cache delegate to persist pubsub data.
 system_property.provider.securityAudit.className=The class to use to audit actions performed by administrators
+system_property.provider.spamReport.className=The class to use for storage of spam reports.
 system_property.provider.user.className=The class to use to provide the Openfire users
 system_property.provider.vcard.className=The class to use to provide vCard handling
 system_property.usermanager.remote-disco-info-timeout-seconds=The maximum time the UserManager should wait, in seconds, for the a remote server to respond to a disco#info request to confirm the presence of a user
@@ -1479,6 +1482,8 @@ system_property.xmpp.server.resolution-delay=The time to wait for a response for
 system_property.xmpp.server.resolution-timeout=The maximum amount of time to wait for successful resolution of a host of a target domain.
 system_property.xmpp.server.connection-max-workers=The maximum amount of worker threads attempting to set up a socket connection to a target remote XMPP domain. A value of '1' will effectively make 'Happy Eyeballs' impossible (as that requires concurrent connection attempts).
 
+system_property.spamreport.notify-admins.enabled=Defines if notifications (via XMPP) are to be sent to administrators of the server when a spam report is received.
+
 # Server properties Page
 
 server.properties.title=System Properties
@@ -3499,6 +3504,22 @@ security.audit.viewer.timestamp=Timestamp
 security.audit.viewer.show_details=Show details
 security.audit.viewer.hide_details=Hide details
 
+# Spam Report page
+
+spam.report.viewer.title=Spam Report Viewer
+spam.report.viewer.per-page=Reports per page
+spam.report.viewer.total=Total number of reports
+spam.report.viewer.filtered=Filtered reports
+spam.report.viewer.timestamp-from=From
+spam.report.viewer.timestamp-to=To
+spam.report.viewer.id=Id
+spam.report.viewer.reporter=Reported By
+spam.report.viewer.reported=Offender
+spam.report.viewer.type=Type
+spam.report.viewer.timestamp=Timestamp
+spam.report.viewer.show_details=Show details
+spam.report.viewer.hide_details=Hide details
+
 # Client Connections Settings page
 client.connections.settings.title=Client Connections Settings
 client.connections.settings.confirm.updated=Client connections settings have been updated successfully.
@@ -4028,3 +4049,6 @@ commands.event.vcardmodified.note.vcard-does-not-exist=VCard not found.
 commands.generic.ping.label=Request pong from server
 commands.generic.ping.form.title=Server ping result (pong!)
 commands.generic.ping.form.field.timestamp.label=Server Time
+
+# Spam Reporting
+spamreport.notify-admins.notification-message=User {0} reports that they received spam from {1}. Please review the Openfire admin console ({2} > {3} > {4}) for more details.
diff --git a/i18n/src/main/resources/openfire_i18n_nl.properties b/i18n/src/main/resources/openfire_i18n_nl.properties
index 983ffd99f1..d927ffa9da 100644
--- a/i18n/src/main/resources/openfire_i18n_nl.properties
+++ b/i18n/src/main/resources/openfire_i18n_nl.properties
@@ -31,7 +31,9 @@ sidebar.server-email.descr=Klik hier om de e-mail instellingen te wijzigen
 sidebar.server-sms=SMS instellingen
 sidebar.server-sms.descr=Klik hier om SMS instellingen te configureren.
 sidebar.security-audit-viewer=Beveiligings audit data
-sidebar.security-audit-viewer.descr=Klik om de beveiligings audit logboeken te bekijken 
+sidebar.security-audit-viewer.descr=Klik om de beveiligings audit logboeken te bekijken
+sidebar.spam-report-viewer=Spam Rapportage
+sidebar.spam-report-viewer.descr=Klik om de spam rapportage te bekijken
 sidebar.sidebar-server-settings=Serverinstellingen
 sidebar.profile-settings=Profielinstellingen
 sidebar.profile-settings.descr=Klik hier om gebruiker- en groepsprofielconfiguratie te wijzigen.
@@ -1170,6 +1172,7 @@ system_property.provider.lockout.className=De klasse die gebruikt wordt om gebru
 system_property.provider.pubsub-persistence.className=De klasse die gebruikt wordt om pubsub data te persisteren.
 system_property.provider.pubsub-persistence.caching.delegate-className=De klasse die door de cache-delegate gebruikt wordt om pubsub data te persisteren.
 system_property.provider.securityAudit.className=De klasse die gebruikt wordt om acties die worden uitgevoerd door administratoren te auditten.
+system_property.provider.spamReport.className=De klassie die gebruikt wordt om spam rapportages op te slaan.
 system_property.provider.user.className=De klasse die gebruikt wordt om Openfire gebruikers te definieren.
 system_property.provider.vcard.className=De klasse die gebruikt wordt voor de verwerking van vCards.
 system_property.usermanager.remote-disco-info-timeout-seconds=De maximale tijd (in seconden) dat de UserManager moet wachten voor het antwoord van een externe server op een disco#info request bedoeld om de statusinformatie van een gebruiker te bevestigen.
@@ -1277,6 +1280,8 @@ system_property.xmpp.server.resolution-delay=Hoe lang te wachten op een antwoord
 system_property.xmpp.server.resolution-timeout=De maximale wachttijd op een succesvolle resolutie van een machinenaam in het doel-domein.
 system_property.xmpp.server.connection-max-workers=Het maximum aantal parallele processen waarin een socketverbinding naar een XMPP doeldomein wordt opgezet. Een waarde van '1' maakt 'Happy Eyeballs' effectief onmogelijk (omdat dat is gebaseerd op parallele pogingen).
 
+system_property.spamreport.notify-admins.enabled=Definieert of notificiaties (via XMPP) naar administratoren van de server worden gestuurd, als een gebruiker spam rapporteert.
+
 # Server properties Page
 
 server.properties.title=Systeemeigenschappen
@@ -3152,3 +3157,6 @@ system.cache-details.delete_confirm=Weet u zeker dat u de cache entiteit met key
 system.cache-details.deleted=De cache entiteit met key {0} is verwijderd.
 system.cache-details.key_not_found=De cache entiteit met sleutel {0} kan niet worden verwijderd - de entiteit zou al verlopen kunnen zijn.
 system.cache-details.cancelled=Het verzoek is geannuleerd. Er zijn geen wijzigingen aan de cache doorgevoerd.
+
+# Spam Reporting
+spamreport.notify-admins.notification-message=Gebruiker {0} rapporteert spam te hebben ontvangen van {1}. Bekijk de Openfire Admin Console pagina ({2} > {3} > {4}) voor meer details.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SpamReportViewerServlet.java b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SpamReportViewerServlet.java
new file mode 100644
index 0000000000..2f02580627
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SpamReportViewerServlet.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.admin.servlet;
+
+import org.jivesoftware.openfire.spamreporting.SpamReport;
+import org.jivesoftware.openfire.spamreporting.SpamReportManager;
+import org.jivesoftware.util.ListPager;
+import org.jivesoftware.util.ParamUtils;
+import org.jivesoftware.util.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+@WebServlet(value = "/spam-report-viewer.jsp")
+public class SpamReportViewerServlet extends HttpServlet {
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd");
+
+    private static final String[] SEARCH_FIELDS = {"searchReporter", "searchReported", "searchFrom", "searchTo"};
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        final SpamReportManager spamReportManager = SpamReportManager.getInstance();
+        final List<SpamReport> spamReports = spamReportManager.getSpamReports();
+
+        final Search search = new Search(request);
+        Predicate<SpamReport> predicate = spamReport -> true;
+        if (!search.reporter.isEmpty()) {
+            predicate = predicate.and(spamReport -> StringUtils.containsIgnoringCase(spamReport.getReportingAddress().toString(), search.reporter));
+        }
+        if (!search.reported.isEmpty()) {
+            predicate = predicate.and(spamReport -> StringUtils.containsIgnoringCase(spamReport.getReportedAddress().toString(), search.reported));
+        }
+
+        Optional<Date> from;
+        if (!search.from.isEmpty()) {
+            from = parseSearchDate(search.from);
+            if (!from.isPresent()) {
+                // Nothing matches a bad date!
+                predicate = spamReport -> false;
+            }
+        } else {
+            from = Optional.empty();
+        }
+
+        Optional<Date> to;
+        if (!search.to.isEmpty()) {
+            to = parseSearchDate(search.to);
+            if (!to.isPresent()) {
+                // Nothing matches a bad date!
+                predicate = spamReport -> false;
+            }
+        } else {
+            to = Optional.empty();
+        }
+
+        // Make sure the from/to are the correct way around
+        if (from.isPresent() && to.isPresent() && from.get().after(to.get())) {
+            final Optional<Date> temp = to;
+            to = from;
+            from = temp;
+        }
+
+        if (from.isPresent()) {
+            final Date date = from.get();
+            predicate = predicate.and(spamReport -> !spamReport.getTimestamp().isBefore(date.toInstant()));
+        }
+
+        if (to.isPresent()) {
+            // Intuitively the end date is exclusive, so add an extra day
+            final Instant date = to.get().toInstant().plus(1, ChronoUnit.DAYS);
+            predicate = predicate.and(spamReport -> spamReport.getTimestamp().isBefore(date));
+        }
+
+        final ListPager<SpamReport> listPager = new ListPager<>(request, response, spamReports, predicate, SEARCH_FIELDS);
+
+        request.setAttribute("spamReportManager", spamReportManager);
+        request.setAttribute("listPager", listPager);
+        request.setAttribute("search", search);
+        request.getRequestDispatcher("spam-report-viewer-jsp.jsp").forward(request, response);
+    }
+
+    private static Optional<Date> parseSearchDate(final String searchDate) {
+        try {
+            return Optional.ofNullable(DATE_FORMAT.parse(searchDate));
+        } catch (ParseException e) {
+            return Optional.empty();
+        }
+    }
+
+    public static class Search {
+        private final String reporter;
+        private final String reported;
+        private final String from;
+        private final String to;
+
+        public Search(final HttpServletRequest request) {
+            this.reporter = ParamUtils.getStringParameter(request, "searchReporter", "").trim();
+            this.reported = ParamUtils.getStringParameter(request, "searchReported", "").trim();
+            this.from = ParamUtils.getStringParameter(request, "searchFrom", "").trim();
+            this.to = ParamUtils.getStringParameter(request, "searchTo", "").trim();
+        }
+
+        public String getReporter() {
+            return reporter;
+        }
+
+        public String getReported() {
+            return reported;
+        }
+
+        public String getFrom() {
+            return from;
+        }
+
+        public String getTo() {
+            return to;
+        }
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java b/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java
index 8a68c91013..0f58a60f43 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java
@@ -68,7 +68,7 @@ public class SchemaManager {
     /**
      * Current Openfire database schema version.
      */
-    private static final int DATABASE_VERSION = 36;
+    private static final int DATABASE_VERSION = 37;
 
     /**
      * Checks the Openfire database schema to ensure that it's installed and up to date.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java
index f4c053cbc6..5ab5f8bb89 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2025 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,24 +29,29 @@
 import org.jivesoftware.openfire.privacy.PrivacyListManager;
 import org.jivesoftware.openfire.privacy.PrivacyListProvider;
 import org.jivesoftware.openfire.session.ClientSession;
+import org.jivesoftware.openfire.spamreporting.SpamReport;
+import org.jivesoftware.openfire.spamreporting.SpamReportManager;
+import org.jivesoftware.openfire.stanzaid.StanzaID;
 import org.jivesoftware.openfire.user.User;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xmpp.packet.IQ;
-import org.xmpp.packet.JID;
-import org.xmpp.packet.PacketError;
-import org.xmpp.packet.Presence;
+import org.xmpp.packet.*;
 
+import javax.annotation.Nonnull;
+import java.time.Instant;
 import java.util.*;
 
 /**
- * Implementation of XEP-0191 "Blocking Command".
+ * Implementation of XEP-0191 "Blocking Command". This implementation supports the optional extension that's defined
+ * in XEP-0377 "Spam Reporting".
  *
  * This implementation uses the default privacy list of a user to store its blocklist.
  *
  * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ * @see <a href="https://xmpp.org/extensions/xep-0191.html">XEP-0191: Blocking Command</a>
+ * @see <a href="https://xmpp.org/extensions/xep-0377.html">XEP-0337: Spam Reporting</a>
  */
 public class IQBlockingHandler extends IQHandler implements ServerFeaturesProvider
 {
@@ -54,6 +59,9 @@ public class IQBlockingHandler extends IQHandler implements ServerFeaturesProvid
 
     public static final String NAMESPACE = "urn:xmpp:blocking";
 
+    public static final String XEP_0377_ELEMENT_NAME = "report";
+    public static final String XEP_0377_NAMESPACE = "urn:xmpp:reporting:1";
+
     public IQBlockingHandler()
     {
         super( "XEP-0191 Blocking Command handler" );
@@ -69,7 +77,7 @@ public IQHandlerInfo getInfo()
     @Override
     public Iterator<String> getFeatures()
     {
-        return Collections.singletonList( NAMESPACE ).iterator();
+        return List.of(NAMESPACE, XEP_0377_NAMESPACE).iterator();
     }
 
     @Override
@@ -130,13 +138,18 @@ else if ( iq.getType().equals( IQ.Type.set ) && "block".equals( iq.getChildEleme
                 }
 
                 final List<JID> toBlocks = new ArrayList<>();
+                final Set<SpamReport> reports = new HashSet<>();
+                final Instant now = Instant.now();
                 for ( final Element item : items )
                 {
-                    toBlocks.add( new JID( item.attributeValue( "jid" ) ) );
+                    final JID offender = new JID(item.attributeValue( "jid" ));
+                    reports.addAll(parseSpamReportsFromChildren(now, requester.asBareJID(), offender, item));
+                    toBlocks.add(offender);
                 }
 
                 addToBlockList( user, toBlocks );
                 pushBlocklistUpdates( user, toBlocks );
+                SpamReportManager.getInstance().process(reports);
 
                 return IQ.createResultIQ( iq );
             }
@@ -179,6 +192,33 @@ else if ( iq.getType().equals( IQ.Type.set ) && "unblock".equals( iq.getChildEle
         }
     }
 
+    /**
+     * Parses and returns any XEP-0377 defined spam reports found in the children of the provided element.
+     * @param timestamp The timestamp of the report.
+     * @param reportingAddress The entity doing the reporting
+     * @param reportedAddress The subject of the report (the 'offender').
+     * @param parentElement The parent element from which to parse spam reports.
+     * @return A list of spam reports
+     * @see XEP-0377
+     */
+    @Nonnull
+    public static List<SpamReport> parseSpamReportsFromChildren(final Instant timestamp, final JID reportingAddress, final JID reportedAddress, final Element parentElement)
+    {
+        final List<SpamReport> result = new ArrayList<>();
+        final List<Element> reports = parentElement.elements( QName.get(XEP_0377_ELEMENT_NAME, XEP_0377_NAMESPACE) );
+
+        if (reports != null) {
+            for (final Element report : reports) {
+                final String reason = report.attributeValue("reason");
+                final Set<SpamReport.Text> context = SpamReport.Text.allFromChildren(report);
+                final Set<StanzaID> offendingStanzas = new HashSet<>(StanzaID.allFromChildren(report));
+                result.add(SpamReport.generate(timestamp, reportingAddress, reportedAddress, reason, context, offendingStanzas));
+            }
+        }
+
+        return result;
+    }
+
     /**
      * Retrieves all of the JIDs that are on the blocklist of the provided user.
      *
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
index 89207eece8..e59e9c9ad9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
@@ -33,6 +33,7 @@
 import org.jivesoftware.openfire.handler.IQPingHandler;
 import org.jivesoftware.openfire.muc.*;
 import org.jivesoftware.openfire.muc.cluster.SyncLocalOccupantsAndSendJoinPresenceTask;
+import org.jivesoftware.openfire.stanzaid.StanzaID;
 import org.jivesoftware.openfire.stanzaid.StanzaIDUtil;
 import org.jivesoftware.openfire.user.UserAlreadyExistsException;
 import org.jivesoftware.openfire.user.UserManager;
@@ -2992,7 +2993,7 @@ else if (name != null && node == null) {
                 if ( IQMUCvCardHandler.PROPERTY_ENABLED.getValue() ) {
                     features.add( IQMUCvCardHandler.NAMESPACE );
                 }
-                features.add( "urn:xmpp:sid:0" );
+                features.add(StanzaID.NAMESPACE);
             }
         }
         return features.iterator();
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/DefaultSpamReportProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/DefaultSpamReportProvider.java
new file mode 100644
index 0000000000..3f2705128e
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/DefaultSpamReportProvider.java
@@ -0,0 +1,355 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.spamreporting;
+
+import org.dom4j.*;
+import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.openfire.stanzaid.StanzaID;
+import org.jivesoftware.util.SAXReaderUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.*;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.sql.*;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * A data access object stores spam rapports in an Openfire-provided database structure.
+ *
+ * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ */
+public class DefaultSpamReportProvider implements SpamReportProvider
+{
+    protected static final DocumentFactory docFactory = DocumentFactory.getInstance();
+
+    private static final Logger Log = LoggerFactory.getLogger(DefaultSpamReportProvider.class);
+
+    private static final String STORE_REPORT = "INSERT INTO ofSpamReport (reportID, reporter, reported, reason, created, context) VALUES (?,?,?,?,?,?)";
+    private static final String STORE_REPORTED_STANZA = "INSERT INTO ofSpamStanza (reportID, stanzaIDValue, stanzaIDBy, stanza) VALUES (?,?,?,?)";
+    private static final String GET_REPORT = "SELECT (reportID, reporter, reported, reason, created, context) FROM ofSpamReport WHERE reportID = ?";
+    private static final String GET_REPORTED_STANZAS = "SELECT reportID, reporter, reported, reason, created, context FROM ofSpamStanza r WHERE reportID = ?";
+    private static final String GET_REPORTS_SINCE = "SELECT reportID, reporter, reported, reason, created, context FROM ofSpamReport WHERE created >= ? ORDER BY created ASC, reportID ASC";
+    private static final String GET_REPORTS_BY = "SELECT reportID, reporter, reported, reason, created, context FROM ofSpamReport WHERE reporter = ? ORDER BY created ASC, reportID ASC";
+    private static final String GET_REPORTS_ABOUT = "SELECT reportID, reporter, reported, reason, created, context FROM ofSpamReport WHERE reported = ? ORDER BY created ASC, reportID ASC";
+
+    @Override
+    public void store(@Nonnull final SpamReport spamReport)
+    {
+        Log.trace("Storing spam report: {}", spamReport);
+
+        boolean abort = false;
+        Connection con = null;
+        PreparedStatement psmttReport = null;
+        PreparedStatement pstmtStanza = null;
+        try {
+            con = DbConnectionManager.getTransactionConnection();
+
+            // Storing the report itself.
+            psmttReport = con.prepareStatement(STORE_REPORT);
+            psmttReport.setLong(1, spamReport.getId());
+            psmttReport.setString(2, spamReport.getReportingAddress().toString());
+            psmttReport.setString(3, spamReport.getReportedAddress().toString());
+            psmttReport.setString(4, spamReport.getReason());
+            psmttReport.setLong(5, spamReport.getTimestamp().toEpochMilli());
+            if (!spamReport.getContext().isEmpty()) {
+                DbConnectionManager.setLargeTextField(psmttReport, 6, spamReport.getContext().stream().map(t -> t.getValue() + (t.getLang() != null ? " (lang: " + t.getLang() + ")" : "")).collect(Collectors.joining("|+|"))); // TODO properly serialize this.
+            } else {
+                psmttReport.setNull(6, Types.VARCHAR);
+            }
+            psmttReport.executeUpdate();
+
+            // Storing associated stanzas.
+            final Map<StanzaID, Optional<Packet>> reportedStanzas = spamReport.getReportedStanzas();
+            if (!reportedStanzas.isEmpty()) {
+                pstmtStanza = con.prepareStatement(STORE_REPORTED_STANZA);
+                for (final Map.Entry<StanzaID, Optional<Packet>> reportedStanza : spamReport.getReportedStanzas().entrySet()) {
+                    pstmtStanza.setLong(1, spamReport.getId());
+                    pstmtStanza.setString(2, reportedStanza.getKey().getId());
+                    pstmtStanza.setString(3, reportedStanza.getKey().getId());
+                    if (reportedStanza.getValue().isPresent()) {
+                        DbConnectionManager.setLargeTextField(pstmtStanza, 4, reportedStanza.getValue().get().toXML());
+                    } else {
+                        psmttReport.setNull(4, Types.VARCHAR);
+                    }
+                    pstmtStanza.addBatch();
+                }
+                pstmtStanza.executeBatch();
+            }
+
+        } catch (SQLException e) {
+            Log.error("A database error prevented successful storage of a spam report: {}", spamReport, e);
+            abort = true;
+        } finally {
+            DbConnectionManager.closeStatement(pstmtStanza);
+            DbConnectionManager.closeStatement(psmttReport);
+            DbConnectionManager.closeTransactionConnection(con, abort);
+        }
+    }
+
+    @Nullable
+    @Override
+    public SpamReport retrieve(final long reportID)
+    {
+        Log.trace("Retrieving spam report with ID {}", reportID);
+
+        Connection con = null;
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            con = DbConnectionManager.getConnection();
+            pstmt = con.prepareStatement(GET_REPORT);
+            pstmt.setLong(1, reportID);
+            rs = pstmt.executeQuery();
+
+            return parse(rs).stream().findFirst().orElse(null);
+        } catch (SQLException e) {
+            Log.error("A database error prevented successful retrieval of a spam report (with ID: {})", reportID, e);
+        } finally {
+            DbConnectionManager.closeConnection(rs, pstmt, con);
+        }
+        return null;
+    }
+
+    @Nonnull
+    public Map<StanzaID, Optional<Packet>> retrieveStanzas(final long reportID)
+    {
+        Log.trace("Retrieving reported stanzas for report with ID {}", reportID);
+        final Map<StanzaID, Optional<Packet>> result = new HashMap<>();
+
+        Connection con = null;
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            con = DbConnectionManager.getConnection();
+            pstmt = con.prepareStatement(GET_REPORTED_STANZAS);
+            pstmt.setLong(1, reportID);
+            rs = pstmt.executeQuery();
+
+            while (rs.next()) {
+                final String stanzaIDValue = rs.getString("stanzaIDValue");
+                final String stanzaIDBy = rs.getString("stanzaIDBy");
+                final String stanza = DbConnectionManager.getLargeTextField(rs, 1);
+                try {
+                    final StanzaID stanzaID = new StanzaID(stanzaIDValue, new JID(stanzaIDBy));
+                    final Packet packet;
+
+                    if (stanza != null) {
+                        final Element root = SAXReaderUtil.readRootElement(stanza);
+                        switch (root.getName()) {
+                            case "presence":
+                                packet = new Presence(root);
+                                break;
+                            case "iq":
+                                packet = new IQ(root);
+                                break;
+                            case "message":
+                                packet = new Message(root);
+                                break;
+                            default:
+                                Log.warn("Unable to serialize database-stored stanza (for report with ID {}) to an XMPP stanza: {}", reportID, stanza);
+                                packet = null;
+                        }
+                    } else {
+                        packet = null;
+                    }
+
+                    result.put(stanzaID, Optional.ofNullable(packet));
+                } catch (Throwable t) {
+                    Log.warn("Unable to serialize database-stored stanza ID or stanza for report with ID {}) to XMPP: {}", reportID, stanza, t);
+                }
+            }
+        } catch (SQLException e) {
+            Log.error("A database error prevented successful retrieval of a reported stanzas (for stanza report with id: {})", reportID, e);
+        } finally {
+            DbConnectionManager.closeConnection(rs, pstmt, con);
+        }
+        return result;
+    }
+
+    @Nonnull
+    @Override
+    public List<SpamReport> getSpamReportsSince(@Nonnull final Instant created)
+    {
+        Log.trace("Retrieving spam reports since {}", created);
+
+        Connection con = null;
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            // This potentially retrieves many rows from the table, and operates on the entire result set. For large
+            // data sets, scalability issues are mitigated by:
+            // - depending on auto-commit being disabled (for postgres). Getting a 'transaction' connection will ensure
+            //   this (if supported).
+            // - MSSQL differentiates between client-cursored and server-cursored result sets. For server-cursored
+            //   result sets, the fetch buffer and scroll window are the same size (as opposed to fetch buffer
+            //   containing all the rows). To hint that a server-cursored result set is desired, it should be configured
+            //   to be 'forward only' as well as 'read only'.
+            con = DbConnectionManager.getTransactionConnection();
+            pstmt = con.prepareStatement(GET_REPORTS_SINCE, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+
+            pstmt.setLong(1, created.toEpochMilli());
+
+            pstmt.setFetchSize(250);
+            pstmt.setFetchDirection(ResultSet.FETCH_FORWARD);
+
+            rs = pstmt.executeQuery();
+
+            return parse(rs);
+        } catch (SQLException e) {
+            Log.error("A database error prevented successful retrieval of a spam reports (since: {})", created, e);
+        } finally {
+            DbConnectionManager.closeResultSet(rs);
+            DbConnectionManager.closeTransactionConnection(pstmt, con, false); // Only doing SELECTs, so transaction rollback does not seem important.
+        }
+        return Collections.emptyList();
+    }
+
+    @Nonnull
+    @Override
+    public List<SpamReport> getSpamReportsByReporter(@Nonnull final JID reporter)
+    {
+        Log.trace("Retrieving spam reports by {}", reporter);
+
+        Connection con = null;
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            // This potentially retrieves many rows from the table, and operates on the entire result set. For large
+            // data sets, scalability issues are mitigated by:
+            // - depending on auto-commit being disabled (for postgres). Getting a 'transaction' connection will ensure
+            //   this (if supported).
+            // - MSSQL differentiates between client-cursored and server-cursored result sets. For server-cursored
+            //   result sets, the fetch buffer and scroll window are the same size (as opposed to fetch buffer
+            //   containing all the rows). To hint that a server-cursored result set is desired, it should be configured
+            //   to be 'forward only' as well as 'read only'.
+            con = DbConnectionManager.getTransactionConnection();
+            pstmt = con.prepareStatement(GET_REPORTS_BY, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+
+            pstmt.setString(1, reporter.toString());
+
+            pstmt.setFetchSize(250);
+            pstmt.setFetchDirection(ResultSet.FETCH_FORWARD);
+
+            rs = pstmt.executeQuery();
+
+            return parse(rs);
+        } catch (SQLException e) {
+            Log.error("A database error prevented successful retrieval of a spam reports (by: {})", reporter, e);
+        } finally {
+            DbConnectionManager.closeResultSet(rs);
+            DbConnectionManager.closeTransactionConnection(pstmt, con, false); // Only doing SELECTs, so transaction rollback does not seem important.
+        }
+        return Collections.emptyList();
+    }
+
+    @Nonnull
+    @Override
+    public List<SpamReport> getSpamReportsByReported(@Nonnull final JID reported)
+    {
+        Log.trace("Retrieving spam reports about {}", reported);
+
+        Connection con = null;
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            // This potentially retrieves many rows from the table, and operates on the entire result set. For large
+            // data sets, scalability issues are mitigated by:
+            // - depending on auto-commit being disabled (for postgres). Getting a 'transaction' connection will ensure
+            //   this (if supported).
+            // - MSSQL differentiates between client-cursored and server-cursored result sets. For server-cursored
+            //   result sets, the fetch buffer and scroll window are the same size (as opposed to fetch buffer
+            //   containing all the rows). To hint that a server-cursored result set is desired, it should be configured
+            //   to be 'forward only' as well as 'read only'.
+            con = DbConnectionManager.getTransactionConnection();
+            pstmt = con.prepareStatement(GET_REPORTS_ABOUT, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+
+            pstmt.setString(1, reported.toString());
+
+            pstmt.setFetchSize(250);
+            pstmt.setFetchDirection(ResultSet.FETCH_FORWARD);
+
+            rs = pstmt.executeQuery();
+
+            return parse(rs);
+        } catch (SQLException e) {
+            Log.error("A database error prevented successful retrieval of a spam reports (about: {})", reported, e);
+        } finally {
+            DbConnectionManager.closeResultSet(rs);
+            DbConnectionManager.closeTransactionConnection(pstmt, con, false); // Only doing SELECTs, so transaction rollback does not seem important.
+        }
+        return Collections.emptyList();
+    }
+
+    protected List<SpamReport> parse(@Nonnull final ResultSet rs) throws SQLException
+    {
+        final List<SpamReport> result = new LinkedList<>();
+
+        long progress = 0;
+        Instant lastProgressReport = Instant.now();
+        while (rs.next())
+        {
+            final long reportID = rs.getLong("reportID");
+            final String reporter = rs.getString("reporter");
+            final String reported = rs.getString("reported");
+            final String reason = rs.getString("reason");
+            final long created = rs.getLong("created");
+            final String contextRaw = DbConnectionManager.getLargeTextField(rs, 6);
+
+            final Set<SpamReport.Text> context = new HashSet<>();
+            // TODO replace this terrible serialization of texts into one column.
+            if (contextRaw != null) {
+                final String regex = "\\W\\(lang\\:\\W?(\\w*)\\)$"; // checks for trailing " (lang: XYZ)"
+                final Pattern pattern = Pattern.compile(regex);
+                for (final String part : contextRaw.split("\\|\\+\\|")) {
+                    final Matcher matcher = pattern.matcher(part);
+                    final String text;
+                    final String language;
+                    if (matcher.find()) {
+                        final String fullMatch = matcher.group(0);
+                        language = matcher.group(1);
+                        text = part.substring(0, part.length() - fullMatch.length());
+                    } else {
+                        text = part;
+                        language = null;
+                    }
+                    context.add(new SpamReport.Text(text, language));
+                }
+            }
+
+            // TODO Improve on this, as it is not ideal to have another query for each row that is being parsed. On the other hand, a simple JOIN would possibly pull in a lot of duplicated data, which isn't ideal either.
+            final Map<StanzaID, Optional<Packet>> reportedStanzas = retrieveStanzas(reportID);
+
+            final SpamReport spamReport = new SpamReport(reportID, Instant.ofEpochMilli(created), new JID(reporter), new JID(reported), reason, context, reportedStanzas);
+            result.add(spamReport);
+
+            // When there are _many_ rows to be processed, log an occasional progress indicator, to let admins know that things are still churning.
+            ++progress;
+            if (lastProgressReport.isBefore(Instant.now().minus(10, ChronoUnit.SECONDS)) ) {
+                Log.debug( "... processed {} spam reports so far.", progress);
+                lastProgressReport = Instant.now();
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReport.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReport.java
new file mode 100644
index 0000000000..2fbee58cf7
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReport.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.spamreporting;
+
+import org.dom4j.*;
+import org.jivesoftware.database.JiveID;
+import org.jivesoftware.database.SequenceManager;
+import org.jivesoftware.openfire.stanzaid.StanzaID;
+import org.jivesoftware.util.JiveConstants;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.Packet;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.time.Instant;
+import java.util.*;
+
+/**
+ * Representation of a report of spam.
+ *
+ * Note that this is <em>not</em> an exact representation of a XEP-0377-defined spam report. That definition is specific
+ * to IQ-Block, while the definition here is intended to be re-usable for other purposes.
+ *
+ * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ */
+@JiveID(JiveConstants.SPAM_REPORT_ID)
+public class SpamReport
+{
+    private final long id;
+
+    private final Instant timestamp;
+
+    private final JID reportingAddress;
+
+    private final JID reportedAddress;
+
+    private final String reason;
+
+    private final Set<Text> context;
+
+    private final Map<StanzaID, Optional<Packet>> reportedStanzas;
+
+    public static SpamReport generate(final Instant timestamp, final JID reportingAddress, final JID reportedAddress, final String reason, final Set<Text> context, final Set<StanzaID> reportedStanzaIDs)
+    {
+        final Map<StanzaID, Optional<Packet>> reportedStanzas = new HashMap<>();
+        for (final StanzaID stanzaID : reportedStanzaIDs) {
+            // TODO query MAM for offending stanzas based on any provided stanza-id. Be careful to only include stanzas that are owned by the reporter, to prevent abuse.
+            reportedStanzas.put(stanzaID, Optional.empty());
+        }
+
+        return new SpamReport(timestamp, reportingAddress, reportedAddress, reason, context, reportedStanzas);
+    }
+
+    public SpamReport(final Instant timestamp, final JID reportingAddress, final JID reportedAddress, final String reason, final Set<Text> context, final Map<StanzaID, Optional<Packet>> reportedStanzas)
+    {
+        this.id = SequenceManager.nextID(this);
+        this.timestamp = timestamp;
+        this.reportingAddress = reportingAddress;
+        this.reportedAddress = reportedAddress;
+        this.reason = reason;
+        this.context = context;
+        this.reportedStanzas = reportedStanzas;
+    }
+
+    public SpamReport(final long id, final Instant timestamp, final JID reportingAddress, final JID reportedAddress, final String reason, final Set<Text> context, final Map<StanzaID, Optional<Packet>> reportedStanzas)
+    {
+        this.id = id;
+        this.timestamp = timestamp;
+        this.reportingAddress = reportingAddress;
+        this.reportedAddress = reportedAddress;
+        this.reason = reason;
+        this.context = context;
+        this.reportedStanzas = reportedStanzas;
+    }
+
+    public long getId()
+    {
+        return id;
+    }
+
+    public Instant getTimestamp()
+    {
+        return timestamp;
+    }
+
+    public JID getReportingAddress()
+    {
+        return reportingAddress;
+    }
+
+    public JID getReportedAddress()
+    {
+        return reportedAddress;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public Set<Text> getContext()
+    {
+        return context;
+    }
+
+    public Map<StanzaID, Optional<Packet>> getReportedStanzas()
+    {
+        return reportedStanzas;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "SpamReport{" +
+            "id=" + id +
+            ", timestamp=" + timestamp +
+            ", reportingAddress=" + reportingAddress +
+            ", reportedAddress=" + reportedAddress +
+            ", reportedStanzaCount=" + reportedStanzas.size() +
+            '}';
+    }
+
+    public static class Text
+    {
+        @Nonnull
+        private final String value;
+
+        @Nullable
+        private final String lang;
+
+        public static Set<Text> allFromChildren(final Element parentElement)
+        {
+            final Set<Text> result = new HashSet<>();
+            final Collection<Element> texts = parentElement.elements( "text" );
+
+            if (texts != null) {
+                for (final Element text : texts) {
+                    result.add(parse(text));
+                }
+            }
+
+            return result;
+        }
+
+        public static Text parse(final Element textElement)
+        {
+            return new Text(textElement.getText(), textElement.attributeValue("xml:lang"));
+        }
+
+        public Text(@Nonnull final String value, @Nullable final String lang)
+        {
+            this.value = value;
+            this.lang = lang == null ? null : (lang.isEmpty() ? null : lang);
+        }
+
+        @Nonnull
+        public String getValue()
+        {
+            return value;
+        }
+
+        @Nullable
+        public String getLang()
+        {
+            return lang;
+        }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Text text = (Text) o;
+            return Objects.equals(value, text.value) && Objects.equals(lang, text.lang);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Objects.hash(value, lang);
+        }
+
+        @Override
+        public String toString()
+        {
+            return "Text{" +
+                "lang='" + lang + '\'' +
+                ", value='" + value + '\'' +
+                '}';
+        }
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportAdminNotifier.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportAdminNotifier.java
new file mode 100644
index 0000000000..b9a503d666
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportAdminNotifier.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.spamreporting;
+
+import org.dom4j.Element;
+import org.jivesoftware.openfire.MessageRouter;
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.util.LocaleUtils;
+import org.jivesoftware.util.SystemProperty;
+import org.jivesoftware.util.TaskEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.Message;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+/**
+ * An event listener that will send an XMPP message to the configured administrators of the server when a spam report
+ * has been filed.
+ *
+ * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ */
+public class SpamReportAdminNotifier implements SpamReportEventListener
+{
+    private static final Logger Log = LoggerFactory.getLogger(SpamReportAdminNotifier.class);
+
+    /**
+     * Defines if notifications (via XMPP) are to be sent to administrators of the server when a spam report is received.
+     */
+    private static final SystemProperty<Boolean> NOTIFY_ADMINS_ENABLED = SystemProperty.Builder.ofType(Boolean.class)
+        .setKey("spamreport.notify-admins.enabled")
+        .setDynamic(true)
+        .setDefaultValue(true)
+        .build();
+
+
+    @Override
+    public void receivedSpamReport(@Nonnull final SpamReport spamReport)
+    {
+        if (!NOTIFY_ADMINS_ENABLED.getValue()) {
+            return;
+        }
+
+        final String body = LocaleUtils.getLocalizedString("spamreport.notify-admins.notification-message",
+            List.of(
+                spamReport.getReportingAddress(),
+                spamReport.getReportedAddress(),
+                LocaleUtils.getLocalizedString("tab.server"),
+                LocaleUtils.getLocalizedString("sidebar.server-manager"),
+                LocaleUtils.getLocalizedString("sidebar.spam-report-viewer")
+        ));
+
+        TaskEngine.getInstance().submit(() -> {
+            final MessageRouter messageRouter = XMPPServer.getInstance().getMessageRouter();
+
+            // TODO add the report in a child element.
+
+            final Message notification = new Message();
+            notification.setFrom(XMPPServer.getInstance().getServerInfo().getXMPPDomain());
+            notification.setBody(body);
+
+            XMPPServer.getInstance().getAdmins().forEach(jid -> {
+                Log.debug("Sending spam report notification message to admin [jid={}]]", jid);
+                notification.setTo(jid);
+                messageRouter.route(notification);
+            });
+        });
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportEventListener.java
new file mode 100644
index 0000000000..cf70650368
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportEventListener.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.spamreporting;
+
+import javax.annotation.Nonnull;
+
+/**
+ * An event listener that is invoked when Openfire processes a spam report.
+ *
+ * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ */
+public interface SpamReportEventListener
+{
+    /**
+     * Invoked when Openfire received a spam report.
+     *
+     * @param spamReport the spam report that was received.
+     */
+    void receivedSpamReport(@Nonnull final SpamReport spamReport);
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportManager.java
new file mode 100644
index 0000000000..1eba6d51e0
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportManager.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.spamreporting;
+
+import org.jivesoftware.util.SystemProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A manager object of processes related to spam rapports.
+ *
+ * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ */
+public class SpamReportManager
+{
+    private static final Logger Log = LoggerFactory.getLogger(SpamReportManager.class);
+
+    public static final SystemProperty<Class> SPAM_REPORT_PROVIDER = SystemProperty.Builder.ofType(Class.class)
+        .setKey("provider.spamReport.className")
+        .setBaseClass(SpamReportProvider.class)
+        .setDefaultValue(DefaultSpamReportProvider.class)
+        .setDynamic(true)
+        .addListener(SpamReportManager::initProvider)
+        .build();
+
+    private static SpamReportProvider spamReportProvider;
+
+    private static void initProvider(final Class<SpamReportProvider> clazz)
+    {
+        if (spamReportProvider == null || !clazz.equals(spamReportProvider.getClass())) {
+            try {
+                spamReportProvider = clazz.getDeclaredConstructor().newInstance();
+            }
+            catch (Exception e) {
+                Log.error("Error loading spam report provider: {}", clazz.getName(), e);
+                spamReportProvider = new DefaultSpamReportProvider();
+            }
+        }
+    }
+    private final Set<SpamReportEventListener> listeners = new HashSet<>();
+
+    private static SpamReportManager instance = null;
+
+    public synchronized static SpamReportManager getInstance() {
+        if (instance == null) {
+            instance = new SpamReportManager();
+            initProvider(SPAM_REPORT_PROVIDER.getValue());
+            instance.addListener(new SpamReportAdminNotifier());
+        }
+        return instance;
+    }
+
+    public void addListener(@Nonnull final SpamReportEventListener listener)
+    {
+        listeners.add(listener);
+    }
+
+    public void removeListener(@Nonnull final SpamReportEventListener listener)
+    {
+        listeners.remove(listener);
+    }
+
+    private void dispatchEvents(final SpamReport report)
+    {
+        Log.trace("Dispatching events for spam report: {}", report);
+        listeners.forEach(listener -> {
+            try {
+                listener.receivedSpamReport(report);
+            } catch (Throwable t) {
+                Log.warn("An exception occurred while invoking listener with spam report {}", report, t);
+            }
+        });
+    }
+
+    public void process(final Set<SpamReport> spamReports)
+    {
+        Log.trace("Processing {} spam report(s)", spamReports.size());
+        spamReports.forEach(spamReport -> {
+            try {
+                process(spamReport);
+            } catch (Throwable t) {
+                Log.warn("An exception occurred while processing spam report {}", spamReport, t);
+            }
+        });
+    }
+
+    public void process(final SpamReport spamReport)
+    {
+        Log.trace("Processing spam report: {}", spamReport);
+
+        // Store the spam report.
+        try {
+            Log.info("User {} reports that they received spam from: {}. See admin console for more details.", spamReport.getReportingAddress(), spamReport.getReportedAddress());
+            spamReportProvider.store(spamReport);
+        } catch (Throwable t) {
+            Log.warn("An exception occurred while storing spam report {}", spamReport, t);
+        }
+
+        // Invoke the event listeners
+        dispatchEvents(spamReport);
+    }
+
+    public List<SpamReport> getSpamReports() {
+        return spamReportProvider.getSpamReports();
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportProvider.java
new file mode 100644
index 0000000000..fa23cec8a9
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spamreporting/SpamReportProvider.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.spamreporting;
+
+import org.xmpp.packet.JID;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.time.Instant;
+import java.util.List;
+
+/**
+ * A data access object definition for entities that manage storage of spam rapports
+ *
+ * @author Guus der Kinderen, guus.der.kinderen@gmail.com
+ */
+public interface SpamReportProvider
+{
+    /**
+     * Persists a spam report.
+     *
+     * @param spamReport the spam report to persist.
+     */
+    void store(@Nonnull final SpamReport spamReport);
+
+    /**
+     * Retrieves a spam report.
+     *
+     * @param id the unique identifier of the spam report.
+     * @return the spam report, or null when no spam report is found.
+     */
+    @Nullable
+    SpamReport retrieve(@Nonnull final long id);
+
+    /**
+     * Retrieves all persisted spam reports, ordered by timestamp.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * @return A collection of persisted spam reports.
+     */
+    default @Nonnull List<SpamReport> getSpamReports() {
+        return getSpamReportsSince(Instant.EPOCH);
+    }
+
+    /**
+     * Counts the number of persisted spam reports.
+     *
+     * @return a count of spam reports.
+     */
+    default int getSpamReportCount() {
+        return getSpamReports().size();
+    }
+
+    /**
+     * Retrieves a sub-collection of persisted spam reports, ordered by timestamp.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * The returned collection will contain less than the requested amount of results only if no more reports were
+     * persisted.
+     *
+     * @param startIndex low endpoint (inclusive) of the subList.
+     * @param numResults the maximum amount of reports to return.
+     * @return A collection of persisted spam reports.
+     */
+    default @Nonnull List<SpamReport> getSpamReports(final int startIndex, final int numResults) {
+        final List<SpamReport> spamReports = getSpamReports();
+        return spamReports.subList(startIndex, Math.min(startIndex + numResults, spamReports.size()));
+    }
+
+    /**
+     * Retrieves all persisted spam reports, ordered by timestamp, reported at or after the provided timestamp.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * @param timestamp earliest point in time (inclusive) for which to return reports.
+     * @return A collection of persisted spam reports.
+     */
+    @Nonnull List<SpamReport> getSpamReportsSince(@Nonnull final Instant timestamp);
+
+    /**
+     * Retrieves a sub-collection of persisted spam reports, ordered by timestamp, reported at or after the provided timestamp.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * The returned collection will contain less than the requested amount of results only if no more reports were
+     * persisted.
+     *
+     * @param timestamp earliest point in time (inclusive) for which to return reports.
+     * @param startIndex low endpoint (inclusive) of the subList.
+     * @param numResults the maximum amount of reports to return.
+     * @return A collection of persisted spam reports.
+     */
+    default @Nonnull List<SpamReport> getSpamReportsSince(final @Nonnull Instant timestamp, final int startIndex, final int numResults) {
+        final List<SpamReport> spamReports = getSpamReportsSince(timestamp);
+        return spamReports.subList(startIndex, Math.min(startIndex + numResults, spamReports.size()));
+    }
+
+    /**
+     * Counts the number of persisted spam reports, reported at or after the provided timestamp.
+     *
+     * @param timestamp earliest point in time (inclusive) for which to count reports.
+     * @return a count of spam reports.
+     */
+    default int getSpamReportCountSince(final @Nonnull Instant timestamp) {
+        return getSpamReportsSince(timestamp).size();
+    }
+
+    /**
+     * Retrieves all persisted spam reports, ordered by timestamp, reported by the provided entity.
+     *
+     * The reporting entity is different from the entity that is being reported. For reports on the <em>reported</em>
+     * entity, see {#getSpamReportsByReported}.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * @param reporter entity that created/submitted the report.
+     * @return A collection of persisted spam reports.
+     * @see #getSpamReportsByReported(JID)
+     */
+    @Nonnull List<SpamReport> getSpamReportsByReporter(@Nonnull final JID reporter);
+
+    /**
+     * Retrieves a sub-collection of persisted spam reports, ordered by timestamp, reported by the provided entity.
+     *
+     * The reporting entity is different from the entity that is being reported. For reports on the <em>reported</em>
+     * entity, see {#getSpamReportsByReported}.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * The returned collection will contain less than the requested amount of results only if no more reports were
+     * persisted.
+     *
+     * @param reporter entity that created/submitted the report.
+     * @param startIndex low endpoint (inclusive) of the subList.
+     * @param numResults the maximum amount of reports to return.
+     * @return A collection of persisted spam reports.
+     * @see #getSpamReportsByReported(JID)
+     */
+    default @Nonnull List<SpamReport> getSpamReportsByReporter(@Nonnull final JID reporter, final int startIndex, final int numResults) {
+        final List<SpamReport> spamReports = getSpamReportsByReporter(reporter);
+        return spamReports.subList(startIndex, Math.min(startIndex + numResults, spamReports.size()));
+    }
+
+    /**
+     * Counts the number of persisted spam reports, reported by the provided entity.
+     *
+     * @param reporter entity that created/submitted the report.
+     * @return a count of spam reports.
+     */
+    default int countSpamReportsByReporter(@Nonnull final JID reporter) {
+        return getSpamReportsByReporter(reporter).size();
+    }
+
+    /**
+     * Retrieves all persisted spam reports, ordered by timestamp, that reference the provided entity as the reported
+     * entity (the 'offender').
+     *
+     * The reported entity (the 'offender') is different from the entity that created the report. For reports by the
+     * <em>reporting</em> entity, see {#getSpamReportsByReporter}.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * @param reported entity for which the report was created (the reported 'offender').
+     * @return A collection of persisted spam reports.
+     * @see #getSpamReportsByReporter(JID)
+     */
+    @Nonnull List<SpamReport> getSpamReportsByReported(@Nonnull final JID reported);
+
+    /**
+     * Retrieves a sub-collection of persisted spam reports, ordered by timestamp, that reference the provided entity as
+     * the reported entity (the 'offender').
+     *
+     * The reported entity (the 'offender') is different from the entity that created the report. For reports by the
+     * <em>reporting</em> entity, see {#getSpamReportsByReporter}.
+     *
+     * When more than one report has the same timestamp, the order of those reports is undefined, but consistent across
+     * invocations.
+     *
+     * The returned collection will contain less than the requested amount of results only if no more reports were
+     * persisted.
+     *
+     * @param reported entity for which the report was created (the reported 'offender').
+     * @param startIndex low endpoint (inclusive) of the subList.
+     * @param numResults the maximum amount of reports to return.
+     * @return A collection of persisted spam reports.
+     * @see #getSpamReportsByReporter(JID)
+     */
+    default @Nonnull List<SpamReport> getSpamReportsByReported(@Nonnull final JID reported, final int startIndex, final int numResults) {
+        final List<SpamReport> spamReports = getSpamReportsByReported(reported);
+        return spamReports.subList(startIndex, Math.min(startIndex + numResults, spamReports.size()));
+    }
+
+    /**
+     * Counts the number of persisted spam reports, that reference the provided entity as the reported entity (the
+     * 'offender').
+     *
+     * @param reported entity for which the report was created (the reported 'offender').
+     * @return a count of spam reports.
+     */
+    default int countSpamReportsByReported(@Nonnull final JID reported) {
+        return getSpamReportsByReported(reported).size();
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaID.java b/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaID.java
new file mode 100644
index 0000000000..ee9bc3c9ab
--- /dev/null
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaID.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.openfire.stanzaid;
+
+import org.dom4j.Element;
+import org.dom4j.QName;
+import org.xmpp.packet.JID;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+
+public class StanzaID
+{
+    public static final String ELEMENT_NAME = "stanza-id";
+    public static final String NAMESPACE = "urn:xmpp:sid:0";
+
+    private final String id;
+    private final JID by;
+
+    public static List<StanzaID> allFromChildren(final Element parentElement)
+    {
+        final List<StanzaID> result = new ArrayList<>();
+        final List<Element> sids = parentElement.elements( QName.get(ELEMENT_NAME, NAMESPACE) );
+
+        if (sids != null) {
+            for (final Element sid : sids) {
+                result.add(parse(sid));
+            }
+        }
+
+        return result;
+    }
+
+    public static StanzaID parse(final Element stanzaIDElement)
+    {
+        return new StanzaID(stanzaIDElement.attributeValue("id"), new JID(stanzaIDElement.attributeValue("by")));
+    }
+
+    public static StanzaID generate(final JID by) {
+        return new StanzaID(UUID.randomUUID().toString(), by);
+    }
+
+    public StanzaID(final String id, final JID by)
+    {
+        this.id = id;
+        this.by = by;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public JID getBy()
+    {
+        return by;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StanzaID stanzaID = (StanzaID) o;
+        return Objects.equals(id, stanzaID.id) && Objects.equals(by, stanzaID.by);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(id, by);
+    }
+
+    public void addAsChildElementTo(final Element parent) {
+        final Element stanzaIdElement = parent.addElement(QName.get( ELEMENT_NAME, NAMESPACE ) );
+        stanzaIdElement.addAttribute( "id", id );
+        stanzaIdElement.addAttribute( "by", by.toString());
+    }
+
+    @Override
+    public String toString()
+    {
+        return "StanzaID{" +
+            "id='" + id + '\'' +
+            ", by=" + by +
+            '}';
+    }
+}
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java b/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java
index 3e118b6305..60b2774cc1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java
@@ -84,7 +84,7 @@ public static Packet ensureUniqueAndStableStanzaID( final Packet packet, final J
 
         // Stanza ID generating entities, which encounter a <stanza-id/> element where the 'by' attribute matches the 'by'
         // attribute they would otherwise set, MUST delete that element even if they are not adding their own stanza ID.
-        final Iterator<Element> existingElementIterator = parentElement.elementIterator( QName.get( "stanza-id", "urn:xmpp:sid:0" ) );
+        final Iterator<Element> existingElementIterator = parentElement.elementIterator( QName.get( StanzaID.ELEMENT_NAME, StanzaID.NAMESPACE ) );
         while (existingElementIterator.hasNext()) {
             final Element element = existingElementIterator.next();
 
@@ -94,12 +94,9 @@ public static Packet ensureUniqueAndStableStanzaID( final Packet packet, final J
             }
         }
 
-        final String id = UUID.randomUUID().toString();
-        Log.debug( "Using newly generated value '{}' for stanza that has id '{}'.", id, packet.getID() );
-
-        final Element stanzaIdElement = parentElement.addElement( QName.get( "stanza-id", "urn:xmpp:sid:0" ) );
-        stanzaIdElement.addAttribute( "id", id );
-        stanzaIdElement.addAttribute( "by", self.toString() );
+        final StanzaID stanzaID = StanzaID.generate(self);
+        Log.debug( "Using newly generated value '{}' for stanza that has id '{}'.", stanzaID.getId(), packet.getID() );
+        stanzaID.addAsChildElementTo(parentElement);
 
         return packet;
     }
@@ -125,24 +122,11 @@ public static String findFirstUniqueAndStableStanzaID( final Packet packet, fina
             throw new IllegalArgumentException( "Argument 'by' cannot be null or an empty string." );
         }
 
-        final List<Element> sids = packet.getElement().elements( QName.get( "stanza-id", "urn:xmpp:sid:0" ) );
-        if ( sids == null )
-        {
-            return null;
-        }
-
-        for ( final Element sid : sids )
-        {
-            if ( by.equals( sid.attributeValue( "by" ) ) )
-            {
-                final String result = sid.attributeValue( "id" );
-                if ( result != null && !result.isEmpty() )
-                {
-                    return result;
-                }
-            }
-        }
-
-        return null;
+        final List<StanzaID> sids = StanzaID.allFromChildren(packet.getElement());
+        return sids.stream()
+            .filter(stanzaID -> stanzaID.getBy().toString().equals(by))
+            .findFirst()
+            .map(StanzaID::getId)
+            .orElse(null);
     }
 }
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java
index 14bb9abd9b..d09ead5997 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java
@@ -28,4 +28,5 @@ public class JiveConstants {
     public static final int SECURITY_AUDIT = 25;
     public static final int MUC_SERVICE = 26;
     public static final int MUC_MESSAGE_ID = 27;
+    public static final int SPAM_REPORT_ID = 42;
 }
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java
index 0aa4545006..c9d6176a4d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java
@@ -29,6 +29,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.DateFormat;
+import java.time.Instant;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -188,6 +189,16 @@ public static void setTimeZone(TimeZone newTimeZone) {
         setProperty("locale.timeZone", timeZone.getID());
     }
 
+    /**
+     * Formats an Instant object to return a time using the global locale.
+     *
+     * @param instant the instant to format.
+     * @return a String representing the time.
+     */
+    public static String formatTime(Instant instant) {
+        return formatTime(Date.from(instant));
+    }
+
     /**
      * Formats a Date object to return a time using the global locale.
      *
@@ -209,6 +220,15 @@ public static String formatTime(Date date) {
         return timeFormat.format(date);
     }
 
+    /**
+     * Formats an Instant object to return a date using the global locale.
+     *
+     * @param instant the Instant to format.
+     * @return a String representing the date.
+     */
+    public static String formatDate(Instant instant) {
+        return formatDate(Date.from(instant));
+    }
     /**
      * Formats a Date object to return a date using the global locale.
      *
@@ -230,6 +250,16 @@ public static String formatDate(Date date) {
         return dateFormat.format(date);
     }
 
+    /**
+     * Formats an Instant object to return a date and time using the global locale.
+     *
+     * @param instant the Instant to format.
+     * @return a String representing the date and time.
+     */
+    public static String formatDateTime(Instant instant) {
+        return formatDateTime(Date.from(instant));
+    }
+
     /**
      * Formats a Date object to return a date and time using the global locale.
      *
diff --git a/xmppserver/src/main/resources/admin-sidebar.xml b/xmppserver/src/main/resources/admin-sidebar.xml
index ab0684d77e..c5532178d3 100644
--- a/xmppserver/src/main/resources/admin-sidebar.xml
+++ b/xmppserver/src/main/resources/admin-sidebar.xml
@@ -65,6 +65,12 @@
             <item id="security-audit-viewer" name="${sidebar.security-audit-viewer}"
                   url="security-audit-viewer.jsp"
                   description="${sidebar.security-audit-viewer.descr}"/>
+
+            <!-- Spam Report Viewer -->
+            <item id="spam-report-viewer" name="${sidebar.spam-report-viewer}"
+                  url="spam-report-viewer.jsp"
+                  description="${sidebar.spam-report-viewer.descr}"/>
+
         </sidebar>
 
         <!-- Server Settings -->
diff --git a/xmppserver/src/main/webapp/WEB-INF/classes/META-INF/admin.tld b/xmppserver/src/main/webapp/WEB-INF/classes/META-INF/admin.tld
index 20d8a079b1..e5d7bb86ea 100644
--- a/xmppserver/src/main/webapp/WEB-INF/classes/META-INF/admin.tld
+++ b/xmppserver/src/main/webapp/WEB-INF/classes/META-INF/admin.tld
@@ -233,6 +233,21 @@
         <function-class>org.jivesoftware.util.JiveGlobals</function-class>
         <function-signature>java.lang.String formatTime(java.util.Date)</function-signature>
     </function>
+    <function>
+        <name>formatDateInstant</name>
+        <function-class>org.jivesoftware.util.JiveGlobals</function-class>
+        <function-signature>java.lang.String formatDate(java.time.Instant)</function-signature>
+    </function>
+    <function>
+        <name>formatDateTimeInstant</name>
+        <function-class>org.jivesoftware.util.JiveGlobals</function-class>
+        <function-signature>java.lang.String formatDateTime(java.time.Instant)</function-signature>
+    </function>
+    <function>
+        <name>formatTimeInstant</name>
+        <function-class>org.jivesoftware.util.JiveGlobals</function-class>
+        <function-signature>java.lang.String formatTime(java.time.Instant)</function-signature>
+    </function>
     <function>
         <name>chopAtWord</name>
         <function-class>org.jivesoftware.util.StringUtils</function-class>
diff --git a/xmppserver/src/main/webapp/spam-report-viewer-jsp.jsp b/xmppserver/src/main/webapp/spam-report-viewer-jsp.jsp
new file mode 100644
index 0000000000..4f47c39ad2
--- /dev/null
+++ b/xmppserver/src/main/webapp/spam-report-viewer-jsp.jsp
@@ -0,0 +1,182 @@
+<%--
+  -
+  - Copyright (C) 2025 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="admin" uri="admin" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<jsp:useBean scope="request" id="spamReportManager" type="org.jivesoftware.openfire.spamreporting.SpamReportManager"/>
+<jsp:useBean scope="request" id="search" type="org.jivesoftware.admin.servlet.SpamReportViewerServlet.Search"/>
+<jsp:useBean scope="request" id="listPager" type="org.jivesoftware.util.ListPager"/>
+
+<html>
+<head>
+    <title><fmt:message key="spam.report.viewer.title"/></title>
+    <meta name="pageID" content="spam-report-viewer"/>
+    <style>
+        /* Override the even/odd coloring of jive-table, as on this page, each 'row' consists of two TR elements (one this is hidden). */
+        .jive-table tr:nth-child(4n) td, .jive-table tr:nth-child(4n-1) td {
+            background: #FFFFFF;
+        }
+        .jive-table tr:nth-child(4n-2) td, .jive-table tr:nth-child(4n-3) td {
+            background: #FBFBFB;
+        }
+    </style>
+</head>
+<body>
+    <p>
+        <fmt:message key="spam.report.viewer.total"/>: <c:out value="${listPager.totalItemCount}"/>
+        <c:if test="${listPager.filtered}">
+            <fmt:message key="spam.report.viewer.filtered"/>: <c:out value="${listPager.filteredItemCount}"/>
+        </c:if>
+
+        <c:if test="${listPager.totalPages > 1}">
+            <fmt:message key="global.showing"/> <c:out value="${listPager.firstItemNumberOnPage}"/>-<c:out
+            value="${listPager.lastItemNumberOnPage}"/>
+        </c:if>
+        -- <fmt:message key="spam.report.viewer.per-page"/>: ${listPager.pageSizeSelection}
+
+    </p>
+
+    <p><fmt:message key="global.pages"/>: [ ${listPager.pageLinks} ]</p>
+    <div class="jive-table">
+        <table>
+            <thead>
+            <tr>
+                <th nowrap><fmt:message key="spam.report.viewer.id" /></th>
+                <th nowrap><fmt:message key="spam.report.viewer.reporter" /></th>
+                <th nowrap><fmt:message key="spam.report.viewer.reported" /></th>
+                <th nowrap><fmt:message key="spam.report.viewer.type" /></th>
+                <th nowrap><fmt:message key="spam.report.viewer.timestamp" /></th>
+            </tr>
+            <tr>
+                <td></td>
+                <td>
+                    <input type="search"
+                           id="searchReporter"
+                           size="20"
+                           value="<c:out value="${search.reporter}"/>"/>
+                    <img src="images/search-16x16.png"
+                         width="16" height="16"
+                         class="clickable"
+                         alt="Search" title="Search"
+                         style="vertical-align: middle; cursor: pointer;"
+                         onclick="submitForm();"
+                    >
+                </td>
+                <td>
+                    <input type="search"
+                           id="searchReported"
+                           size="20"
+                           value="<c:out value="${search.reported}"/>"/>
+                    <img src="images/search-16x16.png"
+                         width="16" height="16"
+                         class="clickable"
+                         alt="Search" title="Search"
+                         style="vertical-align: middle; cursor: pointer;"
+                         onclick="submitForm();"
+                    >
+                </td>
+                <td>
+                </td>
+                <td>
+                    <table>
+                        <tr>
+                            <td nowrap>
+                                <fmt:message key="spam.report.viewer.timestamp-from"/>:
+                            </td>
+                            <td nowrap>
+                                <input type="search"
+                                       id="searchFrom"
+                                       placeholder="YYYY/MM/DD"
+                                       size="10"
+                                       value="<c:out value="${search.from}"/>"/>
+                                <img src="images/search-16x16.png"
+                                     width="16" height="16"
+                                     class="clickable"
+                                     alt="Search" title="Search"
+                                     style="vertical-align: middle; cursor: pointer;"
+                                     onclick="submitForm();"
+                                >
+                            </td>
+                        </tr>
+                        <tr>
+                            <td nowrap>
+                                <fmt:message key="spam.report.viewer.timestamp-to"/>:
+                            </td>
+                            <td nowrap>
+                                <input type="search"
+                                       id="searchTo"
+                                       placeholder="YYYY/MM/DD"
+                                       size="10"
+                                       value="<c:out value="${search.to}"/>"/>
+                                <img src="images/search-16x16.png"
+                                     width="16" height="16"
+                                     class="clickable"
+                                     alt="Search" title="Search"
+                                     style="vertical-align: middle; cursor: pointer;"
+                                     onclick="submitForm();"
+                                >
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            </thead>
+            <tbody>
+            <c:forEach var="spamReport" items="${listPager.itemsOnCurrentPage}">
+                <%--@elvariable id="spamReport" type="org.jivesoftware.openfire.spamreporting.SpamReport"--%>
+
+                <tr>
+                    <td><c:out value="${spamReport.id}"/></td>
+                    <td><c:out value="${spamReport.reportingAddress}"/></td>
+                    <td><c:out value="${spamReport.reportedAddress}"/></td>
+                    <td>
+                        <c:out value="${spamReport.reason}"/>
+                        <c:if test="${not empty spamReport.reportedStanzas}">
+                    <span id='showDetails<c:out value="${spamReport.id}"/>'>
+                        <a href="" onclick='document.getElementById("showDetails<c:out value='${spamReport.id}'/>").style.display="none"; document.getElementById("hideDetails<c:out value='${spamReport.id}'/>").style.display=""; document.getElementById("detailsRow<c:out value='${spamReport.id}'/>").style.display=""; return false;'><fmt:message key="spam.report.viewer.show_details"/></a>
+                    </span>
+                            <span id='hideDetails<c:out value="${spamReport.id}"/>' style='display:none'>
+                        <a href="" onclick='document.getElementById("showDetails<c:out value='${spamReport.id}'/>").style.display=""; document.getElementById("hideDetails<c:out value='${spamReport.id}'/>").style.display="none"; document.getElementById("detailsRow<c:out value='${spamReport.id}'/>").style.display="none"; return false;'><fmt:message key="spam.report.viewer.hide_details"/></a>
+                    </span>
+                        </c:if>
+                    </td>
+                    <td><c:out value="${admin:formatDateTimeInstant(spamReport.timestamp)}"/></td>
+                </tr>
+                <tr id='detailsRow<c:out value="${spamReport.id}"/>' style="display:none">
+                    <td colspan="5">
+                        <c:forEach items="${spamReport.reportedStanzas.entrySet()}" var="entry" varStatus="status">
+                            <c:out value="${entry.key}"/>
+                            <c:if test="${entry.value.isPresent()}">
+                                <c:out value="${entry.value.get()}"/>
+                            </c:if>
+                            <c:if test="${not status.last}">
+                                <br/><br/>
+                            </c:if>
+                        </c:forEach>
+                    </td>
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
+    </div>
+    <p><fmt:message key="global.pages"/>: [ ${listPager.pageLinks} ]</p>
+    ${listPager.jumpToPageForm}
+    <script>
+        ${listPager.pageFunctions}
+    </script>
+</body>