diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2296ed26a829..22968f1531b4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -111,10 +111,10 @@ Prerequisites:
 - [ ] Test 2
 
 ### Test Coverage
-<!-- Please add the test coverages for all changed files here. You can see this when executing the tests locally (see build.gradle and package.json) or when looking into the corresponding Bamboo build plan. -->
-<!-- The line coverage must be above 90% for changes files and you must use extensive and useful assertions for server tests and expect statements for client tests. -->
-<!-- Note: Use the table below and confirm in the last column that you have implemented extensive assertions for server tests and expect statements for client tests. -->
-<!--       You can use `supporting_script/generate_code_cov_table/generate_code_cov_table.py` to automatically generate one from the corresponding Bamboo build plan artefacts. -->
+<!-- Please add the test coverages for all changed files modified in this PR here. You can use `supporting_script/generate_code_cov_table/generate_code_cov_table.py` to automatically generate the coverage table from the corresponding artefacts of your branch (follow the ReadMe for setup details). -->
+<!-- Alternatively you can execute the tests locally (see build.gradle and package.json) or look into the corresponding artefacts. -->
+<!-- The line coverage must be above 90% for changes files, and you must use extensive and useful assertions for server tests and expect statements for client tests. -->
+<!-- Note: Confirm in the last column that you have implemented extensive assertions for server tests and expect statements for client tests. -->
 <!--       Remove rows with only trivial changes from the table. -->
 <!--
 | Class/File | Line Coverage | Confirmation (assert/expect) |
diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java
index 77c01c6fae19..88d5d44e5271 100644
--- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java
+++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java
@@ -108,8 +108,12 @@ public class Result extends DomainObject implements Comparable<Result> {
     @JsonView(QuizView.Before.class)
     private List<Feedback> feedbacks = new ArrayList<>();
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submission.participation instead
+     */
     @ManyToOne
     @JsonView(QuizView.Before.class)
+    @Deprecated(since = "7.7", forRemoval = true)
     private Participation participation;
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -385,15 +389,31 @@ private boolean feedbackTextHasChanged(String existingText, String newText) {
         return !Objects.equals(existingText, newText);
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submission.participation instead
+     * @return the participation
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public Participation getParticipation() {
         return participation;
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submission.participation instead
+     * @param participation the participation to set
+     * @return the result
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public Result participation(Participation participation) {
         this.participation = participation;
         return this;
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submission.participation instead
+     * @param participation the participation to set
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public void setParticipation(Participation participation) {
         this.participation = participation;
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java
index 7a4220399819..331cb3dd6f77 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java
@@ -48,4 +48,9 @@ public BuildJobQueueItem(BuildJobQueueItem queueItem, ResultDTO submissionResult
         this(queueItem.id(), queueItem.name(), queueItem.buildAgent(), queueItem.participationId(), queueItem.courseId(), queueItem.exerciseId(), queueItem.retryCount(),
                 queueItem.priority(), queueItem.status(), queueItem.repositoryInfo(), queueItem.jobTimingInfo(), queueItem.buildConfig(), submissionResult);
     }
+
+    public BuildJobQueueItem(BuildJobQueueItem queueItem, BuildAgentDTO buildAgent, int newRetryCount) {
+        this(queueItem.id(), queueItem.name(), buildAgent, queueItem.participationId(), queueItem.courseId(), queueItem.exerciseId(), newRetryCount, queueItem.priority(), null,
+                queueItem.repositoryInfo(), new JobTimingInfo(queueItem.jobTimingInfo.submissionDate(), ZonedDateTime.now(), null), queueItem.buildConfig(), null);
+    }
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java
index fd06f24e09f7..7c789cfafb28 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java
@@ -378,18 +378,18 @@ private BuildResult parseTestResults(TarArchiveInputStream testResultsTarInputSt
             }
 
             // Read the contents of the tar entry as a string.
-            String xmlString = readTarEntryContent(testResultsTarInputStream);
+            String fileString = readTarEntryContent(testResultsTarInputStream);
             // Get the file name of the tar entry.
             String fileName = getFileName(tarEntry);
 
             try {
                 // Check if the file is a static code analysis report file
                 if (StaticCodeAnalysisTool.getToolByFilePattern(fileName).isPresent()) {
-                    processStaticCodeAnalysisReportFile(fileName, xmlString, staticCodeAnalysisReports, buildJobId);
+                    processStaticCodeAnalysisReportFile(fileName, fileString, staticCodeAnalysisReports, buildJobId);
                 }
                 else {
                     // ugly workaround because in swift result files \n\t breaks the parsing
-                    var testResultFileString = xmlString.replace("\n\t", "");
+                    var testResultFileString = fileString.replace("\n\t", "");
                     if (!testResultFileString.isBlank()) {
                         processTestResultFile(testResultFileString, failedTests, successfulTests);
                     }
@@ -418,7 +418,7 @@ private boolean isValidTestResultFile(TarArchiveEntry tarArchiveEntry) {
         String result = (lastIndexOfSlash != -1 && lastIndexOfSlash + 1 < name.length()) ? name.substring(lastIndexOfSlash + 1) : name;
 
         // Java test result files are named "TEST-*.xml", Python test result files are named "*results.xml".
-        return !tarArchiveEntry.isDirectory() && result.endsWith(".xml") && !result.equals("pom.xml");
+        return !tarArchiveEntry.isDirectory() && (result.endsWith(".xml") && !result.equals("pom.xml") || result.endsWith(".sarif"));
     }
 
     /**
@@ -444,12 +444,12 @@ private String getFileName(TarArchiveEntry tarEntry) {
      * Processes a static code analysis report file and adds the report to the corresponding list.
      *
      * @param fileName                  the file name of the static code analysis report file
-     * @param xmlString                 the content of the static code analysis report file
+     * @param reportContent             the content of the static code analysis report file
      * @param staticCodeAnalysisReports the list of static code analysis reports
      */
-    private void processStaticCodeAnalysisReportFile(String fileName, String xmlString, List<StaticCodeAnalysisReportDTO> staticCodeAnalysisReports, String buildJobId) {
+    private void processStaticCodeAnalysisReportFile(String fileName, String reportContent, List<StaticCodeAnalysisReportDTO> staticCodeAnalysisReports, String buildJobId) {
         try {
-            staticCodeAnalysisReports.add(ReportParser.getReport(xmlString, fileName));
+            staticCodeAnalysisReports.add(ReportParser.getReport(reportContent, fileName));
         }
         catch (UnsupportedToolException e) {
             String msg = "Failed to parse static code analysis report for " + fileName;
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java
index 2c2e8b8e16bb..6bf67b2626e2 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java
@@ -266,16 +266,26 @@ private void checkAvailabilityAndProcessNextBuild() {
             processBuild(buildJob);
         }
         catch (RejectedExecutionException e) {
-            log.error("Couldn't add build job to threadpool: {}\n Concurrent Build Jobs Count: {} Active tasks in pool: {}, Concurrent Build Jobs Size: {}", buildJob,
+            // TODO: we should log this centrally and not on the local node
+            log.error("Couldn't add build job to thread pool: {}\n Concurrent Build Jobs Count: {} Active tasks in pool: {}, Concurrent Build Jobs Size: {}", buildJob,
                     localProcessingJobs.get(), localCIBuildExecutorService.getActiveCount(), localCIBuildExecutorService.getMaximumPoolSize(), e);
 
             // Add the build job back to the queue
             if (buildJob != null) {
                 processingJobs.remove(buildJob.id());
 
-                buildJob = new BuildJobQueueItem(buildJob, new BuildAgentDTO("", "", ""));
-                log.info("Adding build job back to the queue: {}", buildJob);
-                queue.add(buildJob);
+                // At most try out the build job 5 times when they get rejected
+                if (buildJob.retryCount() >= 5) {
+                    // TODO: we should log this centrally and not on the local node
+                    log.error("Build job was rejected 5 times. Not adding build job back to the queue: {}", buildJob);
+                }
+                else {
+                    // NOTE: we increase the retry count here, because the build job was not processed successfully
+                    // TODO: we should try to run this job on a different build agent to avoid getting the same error again
+                    buildJob = new BuildJobQueueItem(buildJob, new BuildAgentDTO("", "", ""), buildJob.retryCount() + 1);
+                    log.info("Adding build job {} back to the queue with retry count {}", buildJob, buildJob.retryCount());
+                    queue.add(buildJob);
+                }
                 localProcessingJobs.decrementAndGet();
             }
 
@@ -360,7 +370,9 @@ private BuildAgentInformation getUpdatedLocalBuildAgentInformation(BuildJobQueue
     }
 
     private List<BuildJobQueueItem> getProcessingJobsOfNode(String memberAddress) {
-        return processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgent().memberAddress(), memberAddress)).toList();
+        // NOTE: we should not use streams with IMap, because it can be unstable, when many items are added at the same time and there is a slow network condition
+        List<BuildJobQueueItem> processingJobsList = new ArrayList<>(processingJobs.values());
+        return processingJobsList.stream().filter(job -> Objects.equals(job.buildAgent().memberAddress(), memberAddress)).toList();
     }
 
     private void removeOfflineNodes() {
@@ -549,7 +561,8 @@ private void resumeBuildAgent() {
     private boolean nodeIsAvailable() {
         log.debug("Currently processing jobs on this node: {}, active threads in Pool: {}, maximum pool size of thread executor : {}", localProcessingJobs.get(),
                 localCIBuildExecutorService.getActiveCount(), localCIBuildExecutorService.getMaximumPoolSize());
-        return localProcessingJobs.get() < localCIBuildExecutorService.getMaximumPoolSize();
+        return localProcessingJobs.get() < localCIBuildExecutorService.getMaximumPoolSize()
+                && localCIBuildExecutorService.getActiveCount() < localCIBuildExecutorService.getMaximumPoolSize() && localCIBuildExecutorService.getQueue().isEmpty();
     }
 
     public class QueuedBuildJobItemListener implements ItemListener<BuildJobQueueItem> {
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java
index aaedef17af0a..9469d9e6d818 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java
@@ -10,14 +10,18 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.SQLRestriction;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonIncludeProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
 import de.tum.cit.aet.artemis.core.domain.Course;
 
 /**
@@ -35,10 +39,20 @@ public class AnswerPost extends Posting {
     @OneToMany(mappedBy = "answerPost", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.EAGER)
     private Set<Reaction> reactions = new HashSet<>();
 
+    /***
+     * The value 1 represents an answer post, given by the enum {{@link PostingType}}
+     */
+    @OneToMany(mappedBy = "postId", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @SQLRestriction("post_type = 1")
+    private Set<SavedPost> savedPosts = new HashSet<>();
+
     @ManyToOne
     @JsonIncludeProperties({ "id", "exercise", "lecture", "course", "courseWideContext", "conversation", "author" })
     private Post post;
 
+    @Transient
+    private boolean isSaved = false;
+
     @JsonProperty("resolvesPost")
     public Boolean doesResolvePost() {
         return resolvesPost;
@@ -76,6 +90,25 @@ public void setPost(Post post) {
         this.post = post;
     }
 
+    @JsonIgnore
+    public Set<SavedPost> getSavedPosts() {
+        return savedPosts;
+    }
+
+    @JsonProperty("isSaved")
+    public boolean getIsSaved() {
+        return isSaved;
+    }
+
+    public void setIsSaved(boolean isSaved) {
+        this.isSaved = isSaved;
+    }
+
+    @JsonIgnore
+    public Conversation getConversation() {
+        return getPost().getConversation();
+    }
+
     /**
      * Helper method to extract the course an AnswerPost belongs to, which is found in different locations based on the parent Post's context
      *
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java
index 4ff2d48fedf5..3bb92cb6a540 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java
@@ -16,14 +16,17 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import jakarta.validation.constraints.Size;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.SQLRestriction;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonIncludeProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
 import de.tum.cit.aet.artemis.core.domain.Course;
@@ -54,6 +57,13 @@ public class Post extends Posting {
     @OneToMany(mappedBy = "post", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.EAGER)
     private Set<AnswerPost> answers = new HashSet<>();
 
+    /***
+     * The value 0 represents a post, given by the enum {{@link PostingType}}
+     */
+    @OneToMany(mappedBy = "postId", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
+    @SQLRestriction("post_type = 0")
+    private Set<SavedPost> savedPosts = new HashSet<>();
+
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "post_tag", joinColumns = @JoinColumn(name = "post_id"))
     @Column(name = "text")
@@ -96,6 +106,9 @@ public class Post extends Posting {
     @Column(name = "vote_count")
     private int voteCount;
 
+    @Transient
+    private boolean isSaved = false;
+
     public Post() {
     }
 
@@ -222,6 +235,20 @@ public void setVoteCount(Integer voteCount) {
         this.voteCount = voteCount != null ? voteCount : 0;
     }
 
+    @JsonIgnore
+    public Set<SavedPost> getSavedPosts() {
+        return savedPosts;
+    }
+
+    @JsonProperty("isSaved")
+    public boolean getIsSaved() {
+        return isSaved;
+    }
+
+    public void setIsSaved(boolean isSaved) {
+        this.isSaved = isSaved;
+    }
+
     /**
      * Helper method to extract the course a Post belongs to, which is found in different locations based on the Post's context
      *
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java
index ad60a1130916..4ae7c6fe800e 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonIncludeProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.DomainObject;
 import de.tum.cit.aet.artemis.core.domain.User;
@@ -118,4 +119,6 @@ public void setAuthorRole(UserRole authorRole) {
 
     @Transient
     public abstract Course getCoursePostingBelongsTo();
+
+    public abstract Conversation getConversation();
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostingType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostingType.java
new file mode 100644
index 000000000000..aedad4d1b55c
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostingType.java
@@ -0,0 +1,23 @@
+package de.tum.cit.aet.artemis.communication.domain;
+
+import java.util.Arrays;
+
+public enum PostingType {
+
+    POST((short) 0), ANSWER((short) 1);
+
+    private final short databaseKey;
+
+    PostingType(short databaseKey) {
+        this.databaseKey = databaseKey;
+    }
+
+    public short getDatabaseKey() {
+        return databaseKey;
+    }
+
+    public static PostingType fromDatabaseKey(short databaseKey) {
+        return Arrays.stream(PostingType.values()).filter(type -> type.getDatabaseKey() == databaseKey).findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown database key: " + databaseKey));
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/SavedPost.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/SavedPost.java
new file mode 100644
index 000000000000..88d1c79b96c4
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/SavedPost.java
@@ -0,0 +1,83 @@
+package de.tum.cit.aet.artemis.communication.domain;
+
+import java.time.ZonedDateTime;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+import de.tum.cit.aet.artemis.core.domain.DomainObject;
+import de.tum.cit.aet.artemis.core.domain.User;
+
+@Entity
+@Table(name = "saved_post")
+public class SavedPost extends DomainObject {
+
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(name = "post_id", nullable = false)
+    private Long postId;
+
+    @Enumerated
+    @Column(name = "post_type", nullable = false)
+    private PostingType postType;
+
+    @Enumerated
+    @Column(name = "status", nullable = false)
+    private SavedPostStatus status;
+
+    @Column(name = "completed_at")
+    private ZonedDateTime completedAt;
+
+    public SavedPost() {
+    }
+
+    public SavedPost(User user, Long postId, PostingType postType, SavedPostStatus status, ZonedDateTime completedAt) {
+        this.user = user;
+        this.postId = postId;
+        this.postType = postType;
+        this.status = status;
+        this.completedAt = completedAt;
+    }
+
+    public Long getPostId() {
+        return postId;
+    }
+
+    public void setPostId(Long postId) {
+        this.postId = postId;
+    }
+
+    public void setStatus(SavedPostStatus status) {
+        this.status = status;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public SavedPostStatus getStatus() {
+        return status;
+    }
+
+    public void setCompletedAt(ZonedDateTime completedAt) {
+        this.completedAt = completedAt;
+    }
+
+    public void setPostType(PostingType postType) {
+        this.postType = postType;
+    }
+
+    public PostingType getPostType() {
+        return postType;
+    }
+
+    public ZonedDateTime getCompletedAt() {
+        return completedAt;
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/SavedPostStatus.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/SavedPostStatus.java
new file mode 100644
index 000000000000..b2fd523277be
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/SavedPostStatus.java
@@ -0,0 +1,23 @@
+package de.tum.cit.aet.artemis.communication.domain;
+
+import java.util.Arrays;
+
+public enum SavedPostStatus {
+
+    IN_PROGRESS((short) 0), COMPLETED((short) 1), ARCHIVED((short) 2);
+
+    private final short databaseKey;
+
+    SavedPostStatus(short databaseKey) {
+        this.databaseKey = databaseKey;
+    }
+
+    public short getDatabaseKey() {
+        return databaseKey;
+    }
+
+    public static SavedPostStatus fromDatabaseKey(short databaseKey) {
+        return Arrays.stream(SavedPostStatus.values()).filter(type -> type.getDatabaseKey() == databaseKey).findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown database key: " + databaseKey));
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/AuthorDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/AuthorDTO.java
new file mode 100644
index 000000000000..8feb1dd746c1
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/AuthorDTO.java
@@ -0,0 +1,13 @@
+package de.tum.cit.aet.artemis.communication.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.cit.aet.artemis.core.domain.User;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record AuthorDTO(Long id, String name, String imageUrl) {
+
+    public AuthorDTO(User user) {
+        this(user.getId(), user.getName(), user.getImageUrl());
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostingConversationDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostingConversationDTO.java
new file mode 100644
index 000000000000..9c93cd4d47e5
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostingConversationDTO.java
@@ -0,0 +1,34 @@
+package de.tum.cit.aet.artemis.communication.dto;
+
+import de.tum.cit.aet.artemis.communication.domain.ConversationType;
+import de.tum.cit.aet.artemis.communication.domain.conversation.Channel;
+import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
+import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat;
+
+public record PostingConversationDTO(Long id, String title, ConversationType type) {
+
+    public PostingConversationDTO(Conversation conversation) {
+        this(conversation.getId(), determineTitle(conversation), determineType(conversation));
+    }
+
+    private static String determineTitle(Conversation conversation) {
+        if (conversation instanceof Channel) {
+            return ((Channel) conversation).getName();
+        }
+        else if (conversation instanceof GroupChat) {
+            return ((GroupChat) conversation).getName();
+        }
+        else {
+            return "Chat";
+        }
+    }
+
+    private static ConversationType determineType(Conversation conversation) {
+        if (conversation instanceof Channel) {
+            return ConversationType.CHANNEL;
+        }
+        else {
+            return ConversationType.DIRECT;
+        }
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostingDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostingDTO.java
new file mode 100644
index 000000000000..a394237230c0
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostingDTO.java
@@ -0,0 +1,40 @@
+package de.tum.cit.aet.artemis.communication.dto;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.cit.aet.artemis.communication.domain.AnswerPost;
+import de.tum.cit.aet.artemis.communication.domain.Posting;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.UserRole;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record PostingDTO(Long id, AuthorDTO author, UserRole role, ZonedDateTime creationDate, ZonedDateTime updatedDate, String content, boolean isSaved, short savedPostStatus,
+        List<ReactionDTO> reactions, PostingConversationDTO conversation, short postingType, Long referencePostId) {
+
+    public PostingDTO(Posting post, boolean isSaved, short savedPostStatus) {
+        this(post.getId(), new AuthorDTO(post.getAuthor()), post.getAuthorRole(), post.getCreationDate(), post.getUpdatedDate(), post.getContent(), isSaved, savedPostStatus,
+                post.getReactions().stream().map(ReactionDTO::new).toList(), new PostingConversationDTO(post.getConversation()), getSavedPostType(post).getDatabaseKey(),
+                getReferencePostId(post));
+    }
+
+    static PostingType getSavedPostType(Posting posting) {
+        if (posting instanceof AnswerPost) {
+            return PostingType.ANSWER;
+        }
+        else {
+            return PostingType.POST;
+        }
+    }
+
+    static Long getReferencePostId(Posting posting) {
+        if (posting instanceof AnswerPost) {
+            return ((AnswerPost) posting).getPost().getId();
+        }
+        else {
+            return posting.getId();
+        }
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/ReactionDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ReactionDTO.java
new file mode 100644
index 000000000000..a81a00799ece
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ReactionDTO.java
@@ -0,0 +1,12 @@
+package de.tum.cit.aet.artemis.communication.dto;
+
+import java.time.ZonedDateTime;
+
+import de.tum.cit.aet.artemis.communication.domain.Reaction;
+
+public record ReactionDTO(Long id, AuthorDTO user, ZonedDateTime creationDate, String emojiId) {
+
+    public ReactionDTO(Reaction reaction) {
+        this(reaction.getId(), new AuthorDTO(reaction.getUser()), reaction.getCreationDate(), reaction.getEmojiId());
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java
index db61138b3a73..43ac921f2d8a 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java
@@ -31,5 +31,12 @@ default AnswerPost findAnswerMessageByIdElseThrow(Long answerPostId) {
         return getValueElseThrow(findById(answerPostId).filter(answerPost -> answerPost.getPost().getConversation() != null), answerPostId);
     }
 
+    @NotNull
+    default AnswerPost findAnswerPostOrMessageByIdElseThrow(Long answerPostId) {
+        return getValueElseThrow(findById(answerPostId), answerPostId);
+    }
+
     long countAnswerPostsByPostIdIn(List<Long> postIds);
+
+    List<AnswerPost> findByIdIn(List<Long> idList);
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java
index 2952c5213432..16c5be3aedc8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java
@@ -114,6 +114,7 @@ private PageImpl<Post> findPostsWithSpecification(Pageable pageable, Specificati
                 LEFT JOIN FETCH p.conversation
                 LEFT JOIN FETCH p.reactions
                 LEFT JOIN FETCH p.tags
+                LEFT JOIN FETCH p.savedPosts
                 LEFT JOIN FETCH p.answers a
                     LEFT JOIN FETCH a.reactions
                     LEFT JOIN FETCH a.post
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java
index aacfbc33d179..1ea95f1d6657 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java
@@ -49,4 +49,6 @@ default Post findPostOrMessagePostByIdElseThrow(Long postId) throws EntityNotFou
     List<Post> findAllByConversationId(Long conversationId);
 
     List<Post> findAllByCourseId(Long courseId);
+
+    List<Post> findByIdIn(List<Long> idList);
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/SavedPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SavedPostRepository.java
new file mode 100644
index 000000000000..e0a00a5896aa
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SavedPostRepository.java
@@ -0,0 +1,143 @@
+package de.tum.cit.aet.artemis.communication.repository;
+
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.domain.SavedPostStatus;
+import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository;
+
+@Profile(PROFILE_CORE)
+@Repository
+@CacheConfig(cacheNames = "savedPosts")
+public interface SavedPostRepository extends ArtemisJpaRepository<SavedPost, Long> {
+
+    /***
+     * Get the amount of saved posts of a user. E.g. for checking if maximum allowed bookmarks are reached.
+     * Cached by user id.
+     *
+     * @param userId to query for
+     *
+     * @return The amount of bookmarks of the user.
+     */
+    @Cacheable(key = "'saved_post_count_' + #userId")
+    Long countByUserId(Long userId);
+
+    /***
+     * Get a single saved post by user id, connected post/answer post id and posting type. Not cached.
+     *
+     * @param userId   of the bookmark
+     * @param postId   of the bookmark
+     * @param postType of the bookmark
+     *
+     * @return The saved post if exists, null otherwise.
+     */
+    SavedPost findSavedPostByUserIdAndPostIdAndPostType(Long userId, Long postId, PostingType postType);
+
+    /***
+     * Query all post ids that a user has saved by a certain posting type. Cached by user id and post type.
+     *
+     * @param userId   of the bookmarks
+     * @param postType of the bookmarks
+     *
+     * @return List of ids of posts/answer posts of the given user, filtered by the given post type.
+     */
+    @Query("""
+                SELECT s.postId
+                FROM SavedPost s
+                WHERE s.user.id = :userId AND s.postType = :postType
+            """)
+    @Cacheable(key = "'saved_post_type_' + #postType.getDatabaseKey() + '_' + #userId")
+    List<Long> findSavedPostIdsByUserIdAndPostType(@Param("userId") Long userId, @Param("postType") PostingType postType);
+
+    /***
+     * Query all saved posts of a user by status. E.g. for displaying the saved posts. Cached by user id and status.
+     *
+     * @param userId of the bookmarks
+     * @param status of the bookmarks
+     *
+     * @return List of saved posts of the given user, filtered by the given status.
+     */
+    @Cacheable(key = "'saved_post_status_' + #status.getDatabaseKey() + '_' + #userId")
+    List<SavedPost> findSavedPostsByUserIdAndStatusOrderByCompletedAtDescIdDesc(Long userId, SavedPostStatus status);
+
+    /***
+     * Query all SavedPosts for a certain user. Not cached.
+     *
+     * @param userId of the bookmarks
+     *
+     * @return List of saved posts of the given user.
+     */
+    List<SavedPost> findSavedPostsByUserId(Long userId);
+
+    /***
+     * Query to get all SavedPosts that are completed before a certain cutoff date. E.g. for cleanup.
+     *
+     * @param cutoffDate the date from where to query the saved posts
+     *
+     * @return List of saved posts which were completed before the given date
+     */
+    List<SavedPost> findByCompletedAtBefore(ZonedDateTime cutoffDate);
+
+    /***
+     * Saving should clear the cached queries for a given user
+     * The value "saved_post_type_0" represents a post, given by the enum {{@link PostingType}}
+     * The value "saved_post_type_1" represents an answer post, given by the enum {{@link PostingType}}
+     * The value "saved_post_status_0" represents in progress, given by the enum {{@link SavedPostStatus}}
+     * The value "saved_post_status_1" represents in completed, given by the enum {{@link SavedPostStatus}}
+     * The value "saved_post_status_2" represents in archived, given by the enum {{@link SavedPostStatus}}
+     *
+     * @param savedPost to create / update
+     *
+     * @return Newly stored saved post
+     */
+    @Caching(evict = { @CacheEvict(key = "'saved_post_type_0_' + #savedPost.user.id"), @CacheEvict(key = "'saved_post_type_1_' + #savedPost.user.id"),
+            @CacheEvict(key = "'saved_post_status_0_' + #savedPost.user.id"), @CacheEvict(key = "'saved_post_status_1_' + #savedPost.user.id"),
+            @CacheEvict(key = "'saved_post_status_2_' + #savedPost.user.id"), @CacheEvict(key = "'saved_post_count_' + #savedPost.user.id"), })
+    @Override
+    <S extends SavedPost> S save(S savedPost);
+
+    /***
+     * Deleting should clear the cached queries for a given user
+     * The value "saved_post_type_0" represents a post, given by the enum {{@link PostingType}}
+     * The value "saved_post_type_1" represents an answer post, given by the enum {{@link PostingType}}
+     * The value "saved_post_status_0" represents in progress, given by the enum {{@link SavedPostStatus}}
+     * The value "saved_post_status_1" represents in completed, given by the enum {{@link SavedPostStatus}}
+     * The value "saved_post_status_2" represents in archived, given by the enum {{@link SavedPostStatus}}
+     *
+     * @param savedPost to delete
+     */
+    @Caching(evict = { @CacheEvict(key = "'saved_post_type_0_' + #savedPost.user.id"), @CacheEvict(key = "'saved_post_type_1_' + #savedPost.user.id"),
+            @CacheEvict(key = "'saved_post_status_0_' + #savedPost.user.id"), @CacheEvict(key = "'saved_post_status_1_' + #savedPost.user.id"),
+            @CacheEvict(key = "'saved_post_status_2_' + #savedPost.user.id"), @CacheEvict(key = "'saved_post_count_' + #savedPost.user.id"), })
+    @Override
+    void delete(SavedPost savedPost);
+
+    /***
+     * The value "sp.postType = 0" represents a post, given by the enum {{@link PostingType}}
+     *
+     * @return List of saved posts that do not have a post entity connected to them
+     */
+    @Query("SELECT sp FROM SavedPost sp " + "LEFT JOIN Post p ON sp.postId = p.id " + "WHERE sp.postType = 0 AND p.id IS NULL")
+    List<SavedPost> findOrphanedPostReferences();
+
+    /***
+     * The value "sp.postType = 1" represents an answer post, given by the enum {{@link PostingType}}
+     *
+     * @return List of saved posts that do not have an answer post entity connected to them
+     */
+    @Query("SELECT sp FROM SavedPost sp " + "LEFT JOIN AnswerPost ap ON sp.postId = ap.id " + "WHERE sp.postType = 1 AND ap.id IS NULL")
+    List<SavedPost> findOrphanedAnswerReferences();
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java
index fa370edc0737..f7645c202f63 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java
@@ -21,6 +21,7 @@
 import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository;
 import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository;
 import de.tum.cit.aet.artemis.communication.repository.PostRepository;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
 import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository;
 import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService;
 import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService;
@@ -59,10 +60,11 @@ public class AnswerMessageService extends PostingService {
     @SuppressWarnings("PMD.ExcessiveParameterList")
     public AnswerMessageService(SingleUserNotificationService singleUserNotificationService, CourseRepository courseRepository, AuthorizationCheckService authorizationCheckService,
             UserRepository userRepository, AnswerPostRepository answerPostRepository, ConversationMessageRepository conversationMessageRepository,
-            ConversationService conversationService, ExerciseRepository exerciseRepository, LectureRepository lectureRepository,
+            ConversationService conversationService, ExerciseRepository exerciseRepository, LectureRepository lectureRepository, SavedPostRepository savedPostRepository,
             WebsocketMessagingService websocketMessagingService, ConversationParticipantRepository conversationParticipantRepository,
             ChannelAuthorizationService channelAuthorizationService, PostRepository postRepository, ConversationRepository conversationRepository) {
-        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository);
+        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository,
+                savedPostRepository);
         this.answerPostRepository = answerPostRepository;
         this.conversationMessageRepository = conversationMessageRepository;
         this.conversationService = conversationService;
@@ -205,6 +207,7 @@ public void deleteAnswerMessageById(Long courseId, Long answerMessageId) {
 
         // delete
         answerPostRepository.deleteById(answerMessageId);
+        preparePostForBroadcast(updatedMessage);
 
         broadcastForPost(new PostDTO(updatedMessage, MetisCrudAction.UPDATE), course.getId(), null, null);
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java
index a54058431b76..06f9409bddc0 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java
@@ -40,6 +40,7 @@
 import de.tum.cit.aet.artemis.communication.dto.PostDTO;
 import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository;
 import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
 import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository;
 import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService;
 import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService;
@@ -78,9 +79,10 @@ public class ConversationMessagingService extends PostingService {
     protected ConversationMessagingService(CourseRepository courseRepository, ExerciseRepository exerciseRepository, LectureRepository lectureRepository,
             ConversationMessageRepository conversationMessageRepository, AuthorizationCheckService authorizationCheckService, WebsocketMessagingService websocketMessagingService,
             UserRepository userRepository, ConversationService conversationService, ConversationParticipantRepository conversationParticipantRepository,
-            ConversationNotificationService conversationNotificationService, ChannelAuthorizationService channelAuthorizationService,
+            ConversationNotificationService conversationNotificationService, ChannelAuthorizationService channelAuthorizationService, SavedPostRepository savedPostRepository,
             GroupNotificationService groupNotificationService, SingleUserNotificationRepository singleUserNotificationRepository) {
-        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository);
+        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository,
+                savedPostRepository);
         this.conversationService = conversationService;
         this.conversationMessageRepository = conversationMessageRepository;
         this.conversationNotificationService = conversationNotificationService;
@@ -154,6 +156,7 @@ public void notifyAboutMessageCreation(CreatedConversationMessage createdConvers
         Set<ConversationNotificationRecipientSummary> recipientSummaries;
         ConversationNotification notification = conversationNotificationService.createNotification(createdMessage, conversation, course,
                 createdConversationMessage.mentionedUsers());
+        preparePostForBroadcast(createdMessage);
         PostDTO postDTO = new PostDTO(createdMessage, MetisCrudAction.CREATE, notification);
         createdMessage.getConversation().hideDetails();
         if (createdConversationMessage.completeConversation() instanceof Channel channel && channel.getIsCourseWide()) {
@@ -284,7 +287,6 @@ private Set<User> filterNotificationRecipients(User author, Conversation convers
     public Page<Post> getMessages(Pageable pageable, @Valid PostContextFilterDTO postContextFilter, User requestingUser, Long courseId) {
         conversationService.isMemberOrCreateForCourseWideElseThrow(postContextFilter.conversationId(), requestingUser, Optional.of(ZonedDateTime.now()));
 
-        // The following query loads posts, answerPosts and reactions to avoid too many database calls (due to eager references)
         Page<Post> conversationPosts = conversationMessageRepository.findMessages(postContextFilter, pageable, requestingUser.getId());
         setAuthorRoleOfPostings(conversationPosts.getContent(), courseId);
 
@@ -342,6 +344,7 @@ public Post updateMessage(Long courseId, Long postId, Post messagePost) {
         updatedPost.setConversation(conversation);
 
         // emit a post update via websocket
+        preparePostForBroadcast(updatedPost);
         broadcastForPost(new PostDTO(updatedPost, MetisCrudAction.UPDATE), course.getId(), null, null);
 
         return updatedPost;
@@ -369,7 +372,7 @@ public void deleteMessageById(Long courseId, Long postId) {
         conversation = conversationService.getConversationById(conversation.getId());
 
         conversationService.notifyAllConversationMembersAboutUpdate(conversation);
-
+        preparePostForBroadcast(post);
         broadcastForPost(new PostDTO(post, MetisCrudAction.DELETE), course.getId(), null, null);
     }
 
@@ -400,6 +403,8 @@ public Post changeDisplayPriority(Long courseId, Long postId, DisplayPriority di
 
         Post updatedMessage = conversationMessageRepository.save(message);
         message.getConversation().hideDetails();
+        preparePostForBroadcast(message);
+        preparePostForBroadcast(updatedMessage);
         broadcastForPost(new PostDTO(message, MetisCrudAction.UPDATE), course.getId(), null, null);
         return updatedMessage;
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java
index f3a01dab6ba6..786675a38986 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java
@@ -21,6 +21,7 @@
 import de.tum.cit.aet.artemis.communication.domain.ConversationNotificationRecipientSummary;
 import de.tum.cit.aet.artemis.communication.domain.Post;
 import de.tum.cit.aet.artemis.communication.domain.Posting;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
 import de.tum.cit.aet.artemis.communication.domain.UserRole;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Channel;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
@@ -29,6 +30,7 @@
 import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction;
 import de.tum.cit.aet.artemis.communication.dto.PostDTO;
 import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration;
 import de.tum.cit.aet.artemis.core.domain.User;
@@ -53,6 +55,8 @@ public abstract class PostingService {
 
     protected final LectureRepository lectureRepository;
 
+    protected final SavedPostRepository savedPostRepository;
+
     protected final ConversationParticipantRepository conversationParticipantRepository;
 
     protected final AuthorizationCheckService authorizationCheckService;
@@ -65,7 +69,7 @@ public abstract class PostingService {
 
     protected PostingService(CourseRepository courseRepository, UserRepository userRepository, ExerciseRepository exerciseRepository, LectureRepository lectureRepository,
             AuthorizationCheckService authorizationCheckService, WebsocketMessagingService websocketMessagingService,
-            ConversationParticipantRepository conversationParticipantRepository) {
+            ConversationParticipantRepository conversationParticipantRepository, SavedPostRepository savedPostRepository) {
         this.courseRepository = courseRepository;
         this.userRepository = userRepository;
         this.exerciseRepository = exerciseRepository;
@@ -73,6 +77,28 @@ protected PostingService(CourseRepository courseRepository, UserRepository userR
         this.authorizationCheckService = authorizationCheckService;
         this.websocketMessagingService = websocketMessagingService;
         this.conversationParticipantRepository = conversationParticipantRepository;
+        this.savedPostRepository = savedPostRepository;
+    }
+
+    /**
+     * Helper method to prepare the post included in the websocket message and initiate the broadcasting
+     *
+     * @param post post that should be broadcast
+     */
+    public void preparePostForBroadcast(Post post) {
+        try {
+            var user = userRepository.getUser();
+            var savedPostIds = savedPostRepository.findSavedPostIdsByUserIdAndPostType(user.getId(), PostingType.POST);
+            post.setIsSaved(savedPostIds.contains(post.getId()));
+            var savedAnswerIds = savedPostRepository.findSavedPostIdsByUserIdAndPostType(user.getId(), PostingType.ANSWER);
+            post.getAnswers().forEach(answer -> answer.setIsSaved(savedAnswerIds.contains(answer.getId())));
+        }
+        catch (Exception e) {
+            post.setIsSaved(false);
+            post.getAnswers().forEach(answer -> {
+                answer.setIsSaved(false);
+            });
+        }
     }
 
     /**
@@ -89,6 +115,7 @@ protected void preparePostAndBroadcast(AnswerPost updatedAnswerPost, Course cour
         // we need to remove the existing AnswerPost (based on unchanged id in updatedAnswerPost) and add the updatedAnswerPost afterwards
         updatedPost.removeAnswerPost(updatedAnswerPost);
         updatedPost.addAnswerPost(updatedAnswerPost);
+        preparePostForBroadcast(updatedPost);
         broadcastForPost(new PostDTO(updatedPost, MetisCrudAction.UPDATE, notification), course.getId(), null, null);
     }
 
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java
index a1b9b2b71ec8..562e30dfd48b 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java
@@ -138,6 +138,7 @@ public void deleteReactionById(Long reactionId, Long courseId) {
             updatedPost.removeAnswerPost(updatedAnswerPost);
             updatedPost.addAnswerPost(updatedAnswerPost);
         }
+        plagiarismPostService.preparePostForBroadcast(updatedPost);
         plagiarismPostService.broadcastForPost(new PostDTO(updatedPost, MetisCrudAction.UPDATE), course.getId(), null, null);
         reactionRepository.deleteById(reactionId);
     }
@@ -201,6 +202,7 @@ private Reaction createReactionForPost(Reaction reaction, Post posting, User use
         Post updatedPost = postRepository.save(post);
         updatedPost.setConversation(post.getConversation());
 
+        plagiarismPostService.preparePostForBroadcast(post);
         plagiarismPostService.broadcastForPost(new PostDTO(post, MetisCrudAction.UPDATE), course.getId(), null, null);
         return savedReaction;
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleService.java
new file mode 100644
index 000000000000..25e5922031f5
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleService.java
@@ -0,0 +1,68 @@
+package de.tum.cit.aet.artemis.communication.service;
+
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
+
+@Service
+@Profile(PROFILE_SCHEDULING)
+public class SavedPostScheduleService {
+
+    private static final int DAYS_UNTIL_ARCHIVED_ARE_DELETED = 100;
+
+    private static final Logger log = LoggerFactory.getLogger(SavedPostScheduleService.class);
+
+    private final SavedPostRepository savedPostRepository;
+
+    public SavedPostScheduleService(SavedPostRepository savedPostRepository) {
+        this.savedPostRepository = savedPostRepository;
+    }
+
+    /**
+     * Cleans up all archived/completed posts that are older than specified cutoff date
+     */
+    @Scheduled(cron = "0 0 0 * * *")
+    public void cleanupArchivedSavedPosts() {
+        ZonedDateTime cutoffDate = ZonedDateTime.now().minusDays(DAYS_UNTIL_ARCHIVED_ARE_DELETED);
+
+        List<SavedPost> oldPosts = savedPostRepository.findByCompletedAtBefore(cutoffDate);
+        if (!oldPosts.isEmpty()) {
+            savedPostRepository.deleteAll(oldPosts);
+            log.info("Deleted {} archived saved posts", oldPosts.size());
+        }
+    }
+
+    /**
+     * Cleans up all saved posts where the post entity does not exist anymore
+     */
+    @Scheduled(cron = "0 0 0 * * *")
+    public void cleanupOrphanedSavedPosts() {
+        List<SavedPost> orphanedPosts = savedPostRepository.findOrphanedPostReferences();
+        if (!orphanedPosts.isEmpty()) {
+            savedPostRepository.deleteAll(orphanedPosts);
+            log.info("Deleted {} orphaned post references", orphanedPosts.size());
+        }
+    }
+
+    /**
+     * Cleans up all saved posts where the answer post entity does not exist anymore
+     */
+    @Scheduled(cron = "0 0 0 * * *")
+    public void cleanupOrphanedSavedAnswerPosts() {
+        List<SavedPost> orphanedPosts = savedPostRepository.findOrphanedAnswerReferences();
+        if (!orphanedPosts.isEmpty()) {
+            savedPostRepository.deleteAll(orphanedPosts);
+            log.info("Deleted {} orphaned answer post references", orphanedPosts.size());
+        }
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostService.java
new file mode 100644
index 000000000000..14172c6d3d05
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostService.java
@@ -0,0 +1,123 @@
+package de.tum.cit.aet.artemis.communication.service;
+
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.Posting;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.domain.SavedPostStatus;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
+import de.tum.cit.aet.artemis.core.repository.UserRepository;
+
+@Profile(PROFILE_CORE)
+@Service
+public class SavedPostService {
+
+    private static final int MAX_SAVED_POSTS_PER_USER = 100;
+
+    private final SavedPostRepository savedPostRepository;
+
+    private final UserRepository userRepository;
+
+    public SavedPostService(SavedPostRepository savedPostRepository, UserRepository userRepository) {
+        this.savedPostRepository = savedPostRepository;
+        this.userRepository = userRepository;
+    }
+
+    /**
+     * Saves a post for the currently logged-in user, if post is already saved it returns
+     *
+     * @param post post to save
+     */
+    public void savePostForCurrentUser(Posting post) {
+        var existingSavedPost = this.getSavedPostForCurrentUser(post);
+
+        if (existingSavedPost != null) {
+            return;
+        }
+
+        PostingType type = post instanceof Post ? PostingType.POST : PostingType.ANSWER;
+        var author = userRepository.getUser();
+        var savedPost = new SavedPost(author, post.getId(), type, SavedPostStatus.IN_PROGRESS, null);
+        savedPostRepository.save(savedPost);
+    }
+
+    /**
+     * Removes a bookmark of a post for the currently logged-in user, if post is not saved it returns
+     *
+     * @param post post to remove from bookmarks
+     * @return false if the saved post was not found, true if post was found and deleted
+     */
+    public boolean removeSavedPostForCurrentUser(Posting post) {
+        var existingSavedPost = this.getSavedPostForCurrentUser(post);
+
+        if (existingSavedPost == null) {
+            return false;
+        }
+
+        savedPostRepository.delete(existingSavedPost);
+
+        return true;
+    }
+
+    /**
+     * Updates the status of a bookmark, will return if no bookmark is present
+     *
+     * @param post   post to change status
+     * @param status status to change towards
+     */
+    public void updateStatusOfSavedPostForCurrentUser(Posting post, SavedPostStatus status) {
+        var existingSavedPost = this.getSavedPostForCurrentUser(post);
+
+        if (existingSavedPost == null) {
+            return;
+        }
+
+        existingSavedPost.setStatus(status);
+        existingSavedPost.setCompletedAt(status == SavedPostStatus.IN_PROGRESS ? null : ZonedDateTime.now());
+        savedPostRepository.save(existingSavedPost);
+    }
+
+    /**
+     * Retrieve the saved posts for a given status
+     *
+     * @param status status to query
+     * @return a list of all saved posts of the current user with the given status
+     */
+    public List<SavedPost> getSavedPostsForCurrentUserByStatus(SavedPostStatus status) {
+        var currentUser = userRepository.getUser();
+
+        return savedPostRepository.findSavedPostsByUserIdAndStatusOrderByCompletedAtDescIdDesc(currentUser.getId(), status);
+    }
+
+    /**
+     * Checks if maximum amount of saved posts limit is reached
+     *
+     * @return true if max saved post it reached, false otherwise
+     */
+    public boolean isMaximumSavedPostsReached() {
+        var currentUser = userRepository.getUser();
+
+        return MAX_SAVED_POSTS_PER_USER <= savedPostRepository.countByUserId(currentUser.getId());
+    }
+
+    /**
+     * Helper method to retrieve a bookmark for the current user
+     *
+     * @param post post to search bookmark for
+     * @return The saved post for the given posting if present
+     */
+    private SavedPost getSavedPostForCurrentUser(Posting post) {
+        PostingType type = post instanceof Post ? PostingType.POST : PostingType.ANSWER;
+        var author = userRepository.getUser();
+
+        return savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(author.getId(), post.getId(), type);
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java
index fc6f7e9e1256..88926325aa4e 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java
@@ -5,6 +5,8 @@
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
 import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -64,6 +66,8 @@ public class MailService implements InstantNotificationService {
 
     private final MailSendingService mailSendingService;
 
+    private final List<MarkdownCustomRendererService> markdownCustomRendererServices;
+
     // notification related variables
 
     private static final String NOTIFICATION = "notification";
@@ -89,11 +93,16 @@ public class MailService implements InstantNotificationService {
 
     private static final String WEEKLY_SUMMARY_NEW_EXERCISES = "weeklySummaryNewExercises";
 
-    public MailService(MessageSource messageSource, SpringTemplateEngine templateEngine, TimeService timeService, MailSendingService mailSendingService) {
+    private final HashMap<Long, String> renderedPosts;
+
+    public MailService(MessageSource messageSource, SpringTemplateEngine templateEngine, TimeService timeService, MailSendingService mailSendingService,
+            MarkdownCustomLinkRendererService markdownCustomLinkRendererService, MarkdownCustomReferenceRendererService markdownCustomReferenceRendererService) {
         this.messageSource = messageSource;
         this.templateEngine = templateEngine;
         this.timeService = timeService;
         this.mailSendingService = mailSendingService;
+        markdownCustomRendererServices = List.of(markdownCustomLinkRendererService, markdownCustomReferenceRendererService);
+        renderedPosts = new HashMap<>();
     }
 
     /**
@@ -266,14 +275,30 @@ public void sendNotification(Notification notification, User user, Object notifi
 
             // Render markdown content of post to html
             try {
-                Parser parser = Parser.builder().build();
-                HtmlRenderer renderer = HtmlRenderer.builder().build();
-                String postContent = post.getContent();
-                String renderedPostContent = renderer.render(parser.parse(postContent));
+                String renderedPostContent;
+
+                // To avoid having to re-render the same post multiple times we store it in a hash map
+                if (renderedPosts.containsKey(post.getId())) {
+                    renderedPostContent = renderedPosts.get(post.getId());
+                }
+                else {
+                    Parser parser = Parser.builder().build();
+                    HtmlRenderer renderer = HtmlRenderer.builder()
+                            .attributeProviderFactory(attributeContext -> new MarkdownRelativeToAbsolutePathAttributeProvider(artemisServerUrl.toString()))
+                            .nodeRendererFactory(new MarkdownImageBlockRendererFactory(artemisServerUrl.toString())).build();
+                    String postContent = post.getContent();
+                    renderedPostContent = markdownCustomRendererServices.stream().reduce(renderer.render(parser.parse(postContent)), (s, service) -> service.render(s),
+                            (s1, s2) -> s2);
+                    if (post.getId() != null) {
+                        renderedPosts.put(post.getId(), renderedPostContent);
+                    }
+                }
+
                 post.setContent(renderedPostContent);
             }
             catch (Exception e) {
                 // In case something goes wrong, leave content of post as-is
+                log.error("Error while parsing post content", e);
             }
         }
         else {
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomLinkRendererService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomLinkRendererService.java
new file mode 100644
index 000000000000..1f06aef2404c
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomLinkRendererService.java
@@ -0,0 +1,71 @@
+package de.tum.cit.aet.artemis.communication.service.notifications;
+
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import java.net.URL;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+import org.springframework.web.util.UriComponentsBuilder;
+
+/**
+ * This service implements the rendering of markdown tags that represent a link.
+ * It takes the tag, transforms it into an <a></a> tag, and sets the corresponding href.
+ */
+@Profile(PROFILE_CORE)
+@Service
+public class MarkdownCustomLinkRendererService implements MarkdownCustomRendererService {
+
+    private static final Logger log = LoggerFactory.getLogger(MarkdownCustomLinkRendererService.class);
+
+    private final Set<String> supportedTags;
+
+    @Value("${server.url}")
+    private URL artemisServerUrl;
+
+    public MarkdownCustomLinkRendererService() {
+        this.supportedTags = Set.of("programming", "modeling", "quiz", "text", "file-upload", "lecture", "attachment", "lecture-unit", "slide", "faq");
+    }
+
+    /**
+     * Takes a string and replaces all occurrences of custom markdown tags (e.g. [programming], [faq], etc.) with a link
+     *
+     * @param content string to render
+     *
+     * @return the newly rendered string.
+     */
+    public String render(String content) {
+        String tagPattern = String.join("|", supportedTags);
+        // The pattern checks for the occurrence of any tag and then extracts the link from it
+        Pattern pattern = Pattern.compile("\\[(" + tagPattern + ")\\](.*?)\\((.*?)\\)(.*?)\\[/\\1\\]");
+        Matcher matcher = pattern.matcher(content);
+        String parsedContent = content;
+
+        while (matcher.find()) {
+            try {
+                String textStart = matcher.group(2);
+                String link = matcher.group(3);
+                String textEnd = matcher.group(4);
+                String text = (textStart + " " + textEnd).trim();
+
+                String absoluteUrl = UriComponentsBuilder.fromUri(artemisServerUrl.toURI()).path(link).build().toUriString();
+
+                parsedContent = parsedContent.substring(0, matcher.start()) + "<a href=\"" + absoluteUrl + "\">" + text + "</a>" + parsedContent.substring(matcher.end());
+            }
+            catch (Exception e) {
+                log.error("Not able to render tag. Replacing with empty.", e);
+                parsedContent = parsedContent.substring(0, matcher.start()) + parsedContent.substring(matcher.end());
+            }
+
+            matcher = pattern.matcher(parsedContent);
+        }
+
+        return parsedContent;
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomReferenceRendererService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomReferenceRendererService.java
new file mode 100644
index 000000000000..3ff199e10b77
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomReferenceRendererService.java
@@ -0,0 +1,72 @@
+package de.tum.cit.aet.artemis.communication.service.notifications;
+
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import java.util.HashMap;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+/**
+ * This service implements the rendering of markdown tags that represent a reference (to e.g. a user).
+ * These references cannot directly represent a link, so they are rendered as their text only.
+ */
+@Profile(PROFILE_CORE)
+@Service
+public class MarkdownCustomReferenceRendererService implements MarkdownCustomRendererService {
+
+    private static final Logger log = LoggerFactory.getLogger(MarkdownCustomReferenceRendererService.class);
+
+    private final Set<String> supportedTags;
+
+    private final HashMap<String, String> startingCharacters;
+
+    public MarkdownCustomReferenceRendererService() {
+        supportedTags = Set.of("user", "channel");
+        startingCharacters = new HashMap<>();
+        startingCharacters.put("user", "@");
+        startingCharacters.put("channel", "#");
+    }
+
+    /**
+     * Takes a string and replaces all occurrences of custom markdown tags (e.g. [user], [channel], etc.) with text.
+     * To make it better readable, it prepends an appropriate character. (e.g. for users an @, for channels a #)
+     *
+     * @param content string to render
+     *
+     * @return the newly rendered string.
+     */
+    @Override
+    public String render(String content) {
+        String tagPattern = String.join("|", supportedTags);
+        Pattern pattern = Pattern.compile("\\[(" + tagPattern + ")\\](.*?)\\((.*?)\\)(.*?)\\[/\\1\\]");
+        Matcher matcher = pattern.matcher(content);
+        String parsedContent = content;
+
+        while (matcher.find()) {
+            try {
+                String tag = matcher.group(1);
+                String startingCharacter = startingCharacters.get(tag);
+                startingCharacter = startingCharacter == null ? "" : startingCharacter;
+                String textStart = matcher.group(2);
+                String textEnd = matcher.group(4);
+                String text = startingCharacter + (textStart + " " + textEnd).trim();
+
+                parsedContent = parsedContent.substring(0, matcher.start()) + text + parsedContent.substring(matcher.end());
+            }
+            catch (Exception e) {
+                log.error("Not able to render tag. Replacing with empty.", e);
+                parsedContent = parsedContent.substring(0, matcher.start()) + parsedContent.substring(matcher.end());
+            }
+
+            matcher = pattern.matcher(parsedContent);
+        }
+
+        return parsedContent;
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomRendererService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomRendererService.java
new file mode 100644
index 000000000000..e96eaa8f7a01
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownCustomRendererService.java
@@ -0,0 +1,6 @@
+package de.tum.cit.aet.artemis.communication.service.notifications;
+
+public interface MarkdownCustomRendererService {
+
+    String render(String content);
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownImageBlockRenderer.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownImageBlockRenderer.java
new file mode 100644
index 000000000000..8653e90aa2ea
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownImageBlockRenderer.java
@@ -0,0 +1,44 @@
+package de.tum.cit.aet.artemis.communication.service.notifications;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.commonmark.node.Image;
+import org.commonmark.node.Node;
+import org.commonmark.node.Text;
+import org.commonmark.renderer.NodeRenderer;
+import org.commonmark.renderer.html.HtmlNodeRendererContext;
+import org.commonmark.renderer.html.HtmlWriter;
+
+public class MarkdownImageBlockRenderer implements NodeRenderer {
+
+    private final String baseUrl;
+
+    private final HtmlWriter html;
+
+    MarkdownImageBlockRenderer(HtmlNodeRendererContext context, String baseUrl) {
+        html = context.getWriter();
+        this.baseUrl = baseUrl;
+    }
+
+    @Override
+    public Set<Class<? extends Node>> getNodeTypes() {
+        return Set.of(Image.class);
+    }
+
+    @Override
+    public void render(Node node) {
+        Image image = (Image) node;
+
+        html.tag("a", Map.of("href", baseUrl + image.getDestination()));
+
+        try {
+            html.text(((Text) image.getFirstChild()).getLiteral());
+        }
+        catch (Exception e) {
+            html.text(image.getDestination());
+        }
+
+        html.tag("/a");
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownImageBlockRendererFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownImageBlockRendererFactory.java
new file mode 100644
index 000000000000..4516fc87af81
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownImageBlockRendererFactory.java
@@ -0,0 +1,19 @@
+package de.tum.cit.aet.artemis.communication.service.notifications;
+
+import org.commonmark.renderer.NodeRenderer;
+import org.commonmark.renderer.html.HtmlNodeRendererContext;
+import org.commonmark.renderer.html.HtmlNodeRendererFactory;
+
+public class MarkdownImageBlockRendererFactory implements HtmlNodeRendererFactory {
+
+    private final String baseUrl;
+
+    public MarkdownImageBlockRendererFactory(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    @Override
+    public NodeRenderer create(HtmlNodeRendererContext context) {
+        return new MarkdownImageBlockRenderer(context, baseUrl);
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownRelativeToAbsolutePathAttributeProvider.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownRelativeToAbsolutePathAttributeProvider.java
new file mode 100644
index 000000000000..de95f6cf3af7
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MarkdownRelativeToAbsolutePathAttributeProvider.java
@@ -0,0 +1,32 @@
+package de.tum.cit.aet.artemis.communication.service.notifications;
+
+import java.util.Map;
+
+import org.commonmark.node.Node;
+import org.commonmark.renderer.html.AttributeProvider;
+
+public class MarkdownRelativeToAbsolutePathAttributeProvider implements AttributeProvider {
+
+    private final String baseUrl;
+
+    public MarkdownRelativeToAbsolutePathAttributeProvider(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    /**
+     * We store images and attachments with relative urls, so when rendering we need to replace them with absolute ones
+     *
+     * @param node       rendered Node, if Image or Link we try to replace the source
+     * @param attributes of the Node
+     * @param tagName    of the html element
+     */
+    @Override
+    public void setAttributes(Node node, String tagName, Map<String, String> attributes) {
+        if ("a".equals(tagName)) {
+            String href = attributes.get("href");
+            if (href != null && href.startsWith("/")) {
+                attributes.put("href", baseUrl + href);
+            }
+        }
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java
index bfa04d53cc5f..75c68fbec7a1 100644
--- a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java
@@ -132,6 +132,8 @@ else if (postContextFilter.courseWideChannelIds() != null) {
             if (post.getConversation() != null) {
                 post.getConversation().hideDetails();
             }
+
+            conversationMessagingService.preparePostForBroadcast(post);
         });
         final var headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), coursePosts);
         logDuration(coursePosts.getContent(), principal, timeNanoStart);
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/SavedPostResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/SavedPostResource.java
new file mode 100644
index 000000000000..a7c6ba9c7faa
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/SavedPostResource.java
@@ -0,0 +1,218 @@
+package de.tum.cit.aet.artemis.communication.web;
+
+import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+import de.tum.cit.aet.artemis.communication.domain.AnswerPost;
+import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.Posting;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.domain.SavedPostStatus;
+import de.tum.cit.aet.artemis.communication.dto.PostingDTO;
+import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository;
+import de.tum.cit.aet.artemis.communication.repository.PostRepository;
+import de.tum.cit.aet.artemis.communication.service.SavedPostService;
+import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
+import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException;
+import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent;
+import de.tum.cit.aet.artemis.core.util.TimeLogUtil;
+
+/**
+ * REST controller for managing Message Posts.
+ */
+@Profile(PROFILE_CORE)
+@RestController
+@RequestMapping("api/")
+public class SavedPostResource {
+
+    private static final Logger log = LoggerFactory.getLogger(SavedPostResource.class);
+
+    public static final String ENTITY_NAME = "savedPost";
+
+    private final SavedPostService savedPostService;
+
+    private final PostRepository postRepository;
+
+    private final AnswerPostRepository answerPostRepository;
+
+    public SavedPostResource(SavedPostService savedPostService, PostRepository postRepository, AnswerPostRepository answerPostRepository) {
+        this.savedPostService = savedPostService;
+        this.postRepository = postRepository;
+        this.answerPostRepository = answerPostRepository;
+    }
+
+    /**
+     * GET /saved-posts/{courseId}/{status} : Get saved posts of course with specific status
+     *
+     * @param courseId id of course to filter posts
+     * @param status   saved post status (progress, completed, archived)
+     * @return ResponseEntity with status 200 (Success) if course id and status are ok,
+     *         or with status 400 (Bad Request) if the checks on type or post validity fail
+     */
+    @GetMapping("saved-posts/{courseId}/{status}")
+    @EnforceAtLeastStudent
+    public ResponseEntity<List<PostingDTO>> getSavedPosts(@PathVariable Long courseId, @PathVariable short status) {
+        log.debug("GET getSavedPosts invoked for course {} and status {}", courseId, status);
+        long start = System.nanoTime();
+
+        SavedPostStatus savedPostStatus;
+        try {
+            savedPostStatus = SavedPostStatus.fromDatabaseKey(status);
+        }
+        catch (IllegalArgumentException e) {
+            throw new BadRequestAlertException("The provided post status could not be found.", ENTITY_NAME, "savedPostStatusDoesNotExist");
+        }
+
+        var savedPosts = savedPostService.getSavedPostsForCurrentUserByStatus(savedPostStatus);
+
+        List<Post> posts = postRepository.findByIdIn(savedPosts.stream().filter(savedPost -> savedPost.getPostType() == PostingType.POST).map(SavedPost::getPostId).toList())
+                .stream().filter(post -> Objects.equals(post.getCoursePostingBelongsTo().getId(), courseId)).toList();
+        List<AnswerPost> answerPosts = answerPostRepository
+                .findByIdIn(savedPosts.stream().filter(savedPost -> savedPost.getPostType() == PostingType.ANSWER).map(SavedPost::getPostId).toList()).stream()
+                .filter(post -> Objects.equals(post.getCoursePostingBelongsTo().getId(), courseId)).toList();
+        List<PostingDTO> postingList = new ArrayList<>();
+
+        for (SavedPost savedPost : savedPosts) {
+            Optional posting;
+            if (savedPost.getPostType() == PostingType.ANSWER) {
+                posting = answerPosts.stream().filter(answerPost -> answerPost.getId().equals(savedPost.getPostId())).findFirst();
+            }
+            else {
+                posting = posts.stream().filter(post -> post.getId().equals(savedPost.getPostId())).findFirst();
+            }
+            if (posting.isPresent()) {
+                postingList.add(new PostingDTO((Posting) posting.get(), true, savedPost.getStatus().getDatabaseKey()));
+            }
+        }
+
+        log.info("getSavedPosts took {}", TimeLogUtil.formatDurationFrom(start));
+        return new ResponseEntity<>(postingList, null, HttpStatus.OK);
+    }
+
+    /**
+     * POST /saved-posts/{postId}/{type} : Create a new saved post
+     *
+     * @param postId post to save
+     * @param type   post type (post, answer)
+     * @return ResponseEntity with status 201 (Created) if successfully saved post,
+     *         or with status 400 (Bad Request) if the checks on type or post validity fail
+     */
+    @PostMapping("saved-posts/{postId}/{type}")
+    @EnforceAtLeastStudent
+    public ResponseEntity<Void> savePost(@PathVariable Long postId, @PathVariable short type) {
+        log.debug("POST savePost invoked for post {}", postId);
+        long start = System.nanoTime();
+
+        if (savedPostService.isMaximumSavedPostsReached()) {
+            throw new BadRequestAlertException("The maximum amount of saved posts was reached.", ENTITY_NAME, "savedPostMaxReached");
+        }
+
+        var post = retrievePostingElseThrow(postId, type);
+
+        this.savedPostService.savePostForCurrentUser(post);
+
+        log.info("savePost took {}", TimeLogUtil.formatDurationFrom(start));
+        return new ResponseEntity<>(null, null, HttpStatus.CREATED);
+    }
+
+    /**
+     * DELETE /saved-posts/{postId}/{type} : Remove a saved post
+     *
+     * @param postId post to save
+     * @param type   post type (post, answer)
+     * @return ResponseEntity with status 204 (No content) if successfully deleted post,
+     *         or with status 400 (Bad Request) if the checks on type or post validity fail
+     */
+    @DeleteMapping("saved-posts/{postId}/{type}")
+    @EnforceAtLeastStudent
+    public ResponseEntity<Void> deleteSavedPost(@PathVariable Long postId, @PathVariable short type) {
+        log.debug("DELETE deletePost invoked for post {}", postId);
+        long start = System.nanoTime();
+
+        var post = retrievePostingElseThrow(postId, type);
+
+        if (!this.savedPostService.removeSavedPostForCurrentUser(post)) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "You are not allowed to delete this bookmark.");
+        }
+
+        log.info("deletePost took {}", TimeLogUtil.formatDurationFrom(start));
+        return new ResponseEntity<>(null, null, HttpStatus.NO_CONTENT);
+    }
+
+    /**
+     * PUT /saved-posts/{postId}/{type} : Update the status of a saved post
+     *
+     * @param postId post to save
+     * @param type   post type (post, answer)
+     * @param status saved post status (progress, answer)
+     * @return ResponseEntity with status 200 (Success) if successfully updated saved post status,
+     *         or with status 400 (Bad Request) if the checks on type or post validity fail
+     */
+    @PutMapping("saved-posts/{postId}/{type}")
+    @EnforceAtLeastStudent
+    public ResponseEntity<Void> putSavedPost(@PathVariable Long postId, @PathVariable short type, @RequestParam(name = "status") short status) {
+        log.debug("DELETE putSavedPost invoked for post {}", postId);
+        long start = System.nanoTime();
+
+        var post = retrievePostingElseThrow(postId, type);
+
+        SavedPostStatus savedPostStatus;
+        try {
+            savedPostStatus = SavedPostStatus.fromDatabaseKey(status);
+        }
+        catch (IllegalArgumentException e) {
+            throw new BadRequestAlertException("The provided post status could not be found.", ENTITY_NAME, "savedPostStatusDoesNotExist");
+        }
+
+        this.savedPostService.updateStatusOfSavedPostForCurrentUser(post, savedPostStatus);
+
+        log.info("putSavedPost took {}", TimeLogUtil.formatDurationFrom(start));
+        return new ResponseEntity<>(null, null, HttpStatus.OK);
+    }
+
+    private Posting retrievePostingElseThrow(long postId, short type) throws BadRequestAlertException {
+        PostingType postingType;
+
+        try {
+            postingType = PostingType.fromDatabaseKey(type);
+        }
+        catch (IllegalArgumentException e) {
+            throw new BadRequestAlertException("The provided post type could not be found.", ENTITY_NAME, "savedPostTypeDoesNotExist");
+        }
+
+        Posting post;
+        try {
+            if (postingType == PostingType.POST) {
+                post = postRepository.findPostOrMessagePostByIdElseThrow(postId);
+            }
+            else {
+                post = answerPostRepository.findAnswerPostOrMessageByIdElseThrow(postId);
+            }
+        }
+        catch (EntityNotFoundException e) {
+            throw new BadRequestAlertException("The provided post could not be found.", ENTITY_NAME, "savedPostIdDoesNotExist");
+        }
+
+        return post;
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java
index 6d2bff114552..3accd0fdd184 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java
@@ -290,21 +290,21 @@ private void registerLocalCIMetrics() {
     }
 
     private static int extractRunningBuilds(Optional<SharedQueueManagementService> sharedQueueManagementService) {
-        return sharedQueueManagementService.map(queueManagementService -> queueManagementService.getBuildAgentInformation().stream()
-                .map(buildAgentInformation -> buildAgentInformation.runningBuildJobs().size()).reduce(0, Integer::sum)).orElse(0);
+        return sharedQueueManagementService.map(SharedQueueManagementService::getProcessingJobsSize).orElse(0);
     }
 
     private static int extractQueuedBuilds(Optional<SharedQueueManagementService> sharedQueueManagementService) {
-        return sharedQueueManagementService.map(queueManagementService -> queueManagementService.getQueuedJobs().size()).orElse(0);
+        return sharedQueueManagementService.map(SharedQueueManagementService::getQueuedJobsSize).orElse(0);
     }
 
     private static int extractBuildAgents(Optional<SharedQueueManagementService> sharedQueueManagementService) {
-        return sharedQueueManagementService.map(queueManagementService -> queueManagementService.getBuildAgentInformation().size()).orElse(0);
+        return sharedQueueManagementService.map(SharedQueueManagementService::getBuildAgentInformationSize).orElse(0);
     }
 
     private static int extractMaxConcurrentBuilds(Optional<SharedQueueManagementService> sharedQueueManagementService) {
         return sharedQueueManagementService.map(queueManagementService -> queueManagementService.getBuildAgentInformation().stream()
-                .map(BuildAgentInformation::maxNumberOfConcurrentBuildJobs).reduce(0, Integer::sum)).orElse(0);
+                .filter(agent -> agent.status() != BuildAgentInformation.BuildAgentStatus.PAUSED).map(BuildAgentInformation::maxNumberOfConcurrentBuildJobs)
+                .reduce(0, Integer::sum)).orElse(0);
     }
 
     private void registerWebsocketMetrics() {
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java
index 6498340f3bc2..2ef2478cf295 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java
@@ -40,6 +40,7 @@
 
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress;
 import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
 import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration;
 import de.tum.cit.aet.artemis.core.config.Constants;
 import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException;
@@ -180,6 +181,9 @@ public class User extends AbstractAuditingEntity implements Participant {
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     private Set<GuidedTourSetting> guidedTourSettings = new HashSet<>();
 
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, orphanRemoval = true)
+    private Set<SavedPost> savedPosts = new HashSet<>();
+
     @ManyToMany
     @JoinTable(name = "jhi_user_authority", joinColumns = { @JoinColumn(name = "user_id", referencedColumnName = "id") }, inverseJoinColumns = {
             @JoinColumn(name = "authority_name", referencedColumnName = "name") })
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java
index d06ecfec87af..31937ac6a5b6 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java
@@ -39,6 +39,8 @@
 import org.springframework.util.StringUtils;
 
 import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
 import de.tum.cit.aet.artemis.core.domain.Authority;
 import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting;
 import de.tum.cit.aet.artemis.core.domain.User;
@@ -113,11 +115,13 @@ public class UserService {
 
     private final ParticipationVcsAccessTokenService participationVCSAccessTokenService;
 
+    private final SavedPostRepository savedPostRepository;
+
     public UserService(UserCreationService userCreationService, UserRepository userRepository, AuthorityService authorityService, AuthorityRepository authorityRepository,
             CacheManager cacheManager, Optional<LdapUserService> ldapUserService, GuidedTourSettingsRepository guidedTourSettingsRepository, PasswordService passwordService,
             Optional<VcsUserManagementService> optionalVcsUserManagementService, Optional<CIUserManagementService> optionalCIUserManagementService,
             InstanceMessageSendService instanceMessageSendService, FileService fileService, ScienceEventRepository scienceEventRepository,
-            ParticipationVcsAccessTokenService participationVCSAccessTokenService) {
+            ParticipationVcsAccessTokenService participationVCSAccessTokenService, SavedPostRepository savedPostRepository) {
         this.userCreationService = userCreationService;
         this.userRepository = userRepository;
         this.authorityService = authorityService;
@@ -132,6 +136,7 @@ public UserService(UserCreationService userCreationService, UserRepository userR
         this.fileService = fileService;
         this.scienceEventRepository = scienceEventRepository;
         this.participationVCSAccessTokenService = participationVCSAccessTokenService;
+        this.savedPostRepository = savedPostRepository;
     }
 
     /**
@@ -493,6 +498,12 @@ protected void anonymizeUser(User user) {
         user.setActivated(false);
         user.setGroups(Collections.emptySet());
 
+        List<SavedPost> savedPostsOfUser = savedPostRepository.findSavedPostsByUserId(user.getId());
+
+        if (!savedPostsOfUser.isEmpty()) {
+            savedPostRepository.deleteAll(savedPostsOfUser);
+        }
+
         userRepository.save(user);
         clearUserCaches(user);
         userRepository.flush();
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java
index 27cd50a6e4b9..07c7579751ca 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java
@@ -195,7 +195,7 @@ public ResponseEntity<BuildJobsStatisticsDTO> getBuildJobStatistics(@RequestPara
     }
 
     /**
-     * {@code PUT /api/admin/agent/{agentName}/pause} : Pause the specified build agent.
+     * {@code PUT /api/admin/agents/{agentName}/pause} : Pause the specified build agent.
      * This endpoint allows administrators to pause a specific build agent by its name.
      * Pausing a build agent will prevent it from picking up any new build jobs until it is resumed.
      *
@@ -207,7 +207,7 @@ public ResponseEntity<BuildJobsStatisticsDTO> getBuildJobStatistics(@RequestPara
      * @return {@link ResponseEntity} with status code 204 (No Content) if the agent was successfully paused
      *         or an appropriate error response if something went wrong
      */
-    @PutMapping("agent/{agentName}/pause")
+    @PutMapping("agents/{agentName}/pause")
     public ResponseEntity<Void> pauseBuildAgent(@PathVariable String agentName) {
         log.debug("REST request to pause agent {}", agentName);
         localCIBuildJobQueueService.pauseBuildAgent(agentName);
@@ -215,7 +215,26 @@ public ResponseEntity<Void> pauseBuildAgent(@PathVariable String agentName) {
     }
 
     /**
-     * {@code PUT /api/admin/agent/{agentName}/resume} : Resume the specified build agent.
+     * {@code PUT /api/admin/agents/pause-all} : Pause all build agents.
+     * This endpoint allows administrators to pause all build agents.
+     * Pausing all build agents will prevent them from picking up any new build jobs until they are resumed.
+     *
+     * <p>
+     * <strong>Authorization:</strong> This operation requires admin privileges, enforced by {@code @EnforceAdmin}.
+     * </p>
+     *
+     * @return {@link ResponseEntity} with status code 204 (No Content) if all agents were successfully paused
+     *         or an appropriate error response if something went wrong
+     */
+    @PutMapping("agents/pause-all")
+    public ResponseEntity<Void> pauseAllBuildAgents() {
+        log.debug("REST request to pause all agents");
+        localCIBuildJobQueueService.pauseAllBuildAgents();
+        return ResponseEntity.noContent().build();
+    }
+
+    /**
+     * {@code PUT /api/admin/agents/{agentName}/resume} : Resume the specified build agent.
      * This endpoint allows administrators to resume a specific build agent by its name.
      * Resuming a build agent will allow it to pick up new build jobs again.
      *
@@ -227,10 +246,29 @@ public ResponseEntity<Void> pauseBuildAgent(@PathVariable String agentName) {
      * @return {@link ResponseEntity} with status code 204 (No Content) if the agent was successfully resumed
      *         or an appropriate error response if something went wrong
      */
-    @PutMapping("agent/{agentName}/resume")
+    @PutMapping("agents/{agentName}/resume")
     public ResponseEntity<Void> resumeBuildAgent(@PathVariable String agentName) {
         log.debug("REST request to resume agent {}", agentName);
         localCIBuildJobQueueService.resumeBuildAgent(agentName);
         return ResponseEntity.noContent().build();
     }
+
+    /**
+     * {@code PUT /api/admin/agents/resume-all} : Resume all build agents.
+     * This endpoint allows administrators to resume all build agents.
+     * Resuming all build agents will allow them to pick up new build jobs again.
+     *
+     * <p>
+     * <strong>Authorization:</strong> This operation requires admin privileges, enforced by {@code @EnforceAdmin}.
+     * </p>
+     *
+     * @return {@link ResponseEntity} with status code 204 (No Content) if all agents were successfully resumed
+     *         or an appropriate error response if something went wrong
+     */
+    @PutMapping("agents/resume-all")
+    public ResponseEntity<Void> resumeAllBuildAgents() {
+        log.debug("REST request to resume all agents");
+        localCIBuildJobQueueService.resumeAllBuildAgents();
+        return ResponseEntity.noContent().build();
+    }
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java
index ce891aeb9093..9d8e8627635a 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java
@@ -96,14 +96,19 @@ public abstract class Participation extends DomainObject implements Participatio
     protected Exercise exercise;
 
     /**
-     * Results are not cascaded through the participation because ideally we want the relationship between participations, submissions and results as follows: each participation
-     * has multiple submissions. For each submission there can be a result. Therefore, the result is persisted with the submission. Refer to Submission.result for cascading
-     * settings.
+     * @deprecated: Will be removed for 8.0, please use submissions.results instead
+     *
+     *              Results are not cascaded through the participation because ideally we want the relationship between participations, submissions and results as follows: each
+     *              participation
+     *              has multiple submissions. For each submission there can be a result. Therefore, the result is persisted with the submission. Refer to Submission.result for
+     *              cascading
+     *              settings.
      */
     @OneToMany(mappedBy = "participation")
     @JsonIgnoreProperties(value = "participation", allowSetters = true)
     @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
     @JsonView(QuizView.Before.class)
+    @Deprecated(since = "7.7", forRemoval = true)
     private Set<Result> results = new HashSet<>();
 
     /**
@@ -201,26 +206,52 @@ public void setPracticeMode(boolean practiceMode) {
         this.testRun = practiceMode;
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submissions.results instead
+     * @return the results
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public Set<Result> getResults() {
         return results;
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submissions.results instead
+     * @param results the results
+     * @return the results
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public Participation results(Set<Result> results) {
         this.results = results;
         return this;
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submissions.results instead
+     * @param result the result
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     @Override
     public void addResult(Result result) {
         this.results.add(result);
         result.setParticipation(this);
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submissions.results instead
+     * @param result the result
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public void removeResult(Result result) {
         this.results.remove(result);
         result.setParticipation(null);
     }
 
+    /**
+     * @deprecated: Will be removed for 8.0, please use submissions.results instead
+     * @param results the results
+     */
+    @Deprecated(since = "7.7", forRemoval = true)
     public void setResults(Set<Result> results) {
         this.results = results;
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java
index 0c3ff1beb754..ec2f97befb23 100644
--- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java
@@ -15,6 +15,7 @@
 import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository;
 import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository;
 import de.tum.cit.aet.artemis.communication.repository.PostRepository;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
 import de.tum.cit.aet.artemis.communication.service.PostingService;
 import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService;
 import de.tum.cit.aet.artemis.core.domain.Course;
@@ -40,8 +41,9 @@ public class PlagiarismAnswerPostService extends PostingService {
 
     protected PlagiarismAnswerPostService(CourseRepository courseRepository, AuthorizationCheckService authorizationCheckService, UserRepository userRepository,
             AnswerPostRepository answerPostRepository, PostRepository postRepository, ExerciseRepository exerciseRepository, LectureRepository lectureRepository,
-            WebsocketMessagingService websocketMessagingService, ConversationParticipantRepository conversationParticipantRepository) {
-        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository);
+            WebsocketMessagingService websocketMessagingService, ConversationParticipantRepository conversationParticipantRepository, SavedPostRepository savedPostRepository) {
+        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository,
+                savedPostRepository);
         this.answerPostRepository = answerPostRepository;
         this.postRepository = postRepository;
     }
@@ -164,7 +166,7 @@ public void deleteAnswerPostById(Long courseId, Long answerPostId) {
 
         // delete
         answerPostRepository.deleteById(answerPostId);
-
+        preparePostForBroadcast(post);
         broadcastForPost(new PostDTO(post, MetisCrudAction.UPDATE), course.getId(), null, null);
     }
 
diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java
index fc5bda5882c3..a1034b96e335 100644
--- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java
@@ -16,6 +16,7 @@
 import de.tum.cit.aet.artemis.communication.dto.PostDTO;
 import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository;
 import de.tum.cit.aet.artemis.communication.repository.PostRepository;
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
 import de.tum.cit.aet.artemis.communication.service.PostingService;
 import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService;
 import de.tum.cit.aet.artemis.core.domain.Course;
@@ -42,9 +43,11 @@ public class PlagiarismPostService extends PostingService {
     private final PlagiarismCaseService plagiarismCaseService;
 
     protected PlagiarismPostService(CourseRepository courseRepository, AuthorizationCheckService authorizationCheckService, UserRepository userRepository,
-            PostRepository postRepository, ExerciseRepository exerciseRepository, LectureRepository lectureRepository, WebsocketMessagingService websocketMessagingService,
-            PlagiarismCaseService plagiarismCaseService, PlagiarismCaseRepository plagiarismCaseRepository, ConversationParticipantRepository conversationParticipantRepository) {
-        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository);
+            SavedPostRepository savedPostRepository, PostRepository postRepository, ExerciseRepository exerciseRepository, LectureRepository lectureRepository,
+            WebsocketMessagingService websocketMessagingService, PlagiarismCaseService plagiarismCaseService, PlagiarismCaseRepository plagiarismCaseRepository,
+            ConversationParticipantRepository conversationParticipantRepository) {
+        super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository,
+                savedPostRepository);
         this.postRepository = postRepository;
         this.plagiarismCaseRepository = plagiarismCaseRepository;
         this.plagiarismCaseService = plagiarismCaseService;
@@ -132,6 +135,7 @@ public Post updatePost(Long courseId, Long postId, Post post) {
 
         Post updatedPost = postRepository.save(existingPost);
 
+        preparePostForBroadcast(updatedPost);
         broadcastForPost(new PostDTO(updatedPost, MetisCrudAction.UPDATE), course.getId(), null, null);
         return updatedPost;
     }
@@ -184,6 +188,7 @@ public void deletePostById(Long courseId, Long postId) {
 
         // delete
         postRepository.deleteById(postId);
+        preparePostForBroadcast(post);
         broadcastForPost(new PostDTO(post, MetisCrudAction.DELETE), course.getId(), null, null);
     }
 
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java
index 9068d7fadd9c..dd3ffcbea67a 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java
@@ -1,7 +1,8 @@
 package de.tum.cit.aet.artemis.programming.domain;
 
-import java.util.ArrayList;
+import java.util.EnumMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -10,28 +11,29 @@
  */
 public enum StaticCodeAnalysisTool {
 
-    SPOTBUGS(ProgrammingLanguage.JAVA, "spotbugs:spotbugs", "spotbugsXml.xml"), CHECKSTYLE(ProgrammingLanguage.JAVA, "checkstyle:checkstyle", "checkstyle-result.xml"),
-    PMD(ProgrammingLanguage.JAVA, "pmd:pmd", "pmd.xml"), PMD_CPD(ProgrammingLanguage.JAVA, "pmd:cpd", "cpd.xml"), SWIFTLINT(ProgrammingLanguage.SWIFT, "", "swiftlint-result.xml"),
-    GCC(ProgrammingLanguage.C, "", "gcc.xml");
+    // @formatter:off
+    SPOTBUGS("spotbugsXml.xml"),
+    CHECKSTYLE("checkstyle-result.xml"),
+    PMD("pmd.xml"),
+    PMD_CPD("cpd.xml"),
+    SWIFTLINT("swiftlint-result.xml"),
+    GCC("gcc.xml"),
+    OTHER(null),
+    ;
+    // @formatter:on
 
-    private final ProgrammingLanguage language;
+    // @formatter:off
+    private static final Map<ProgrammingLanguage, List<StaticCodeAnalysisTool>> TOOLS_OF_PROGRAMMING_LANGUAGE = new EnumMap<>(Map.of(
+        ProgrammingLanguage.JAVA, List.of(SPOTBUGS, CHECKSTYLE, PMD, PMD_CPD),
+        ProgrammingLanguage.SWIFT, List.of(SWIFTLINT),
+        ProgrammingLanguage.C, List.of(GCC)
+    ));
+    // @formatter:on
 
-    private final String command;
+    private final String fileName;
 
-    private final String filePattern;
-
-    StaticCodeAnalysisTool(ProgrammingLanguage language, String command, String filePattern) {
-        this.language = language;
-        this.command = command;
-        this.filePattern = filePattern;
-    }
-
-    public String getTask() {
-        return this.command;
-    }
-
-    public String getFilePattern() {
-        return this.filePattern;
+    StaticCodeAnalysisTool(String fileName) {
+        this.fileName = fileName;
     }
 
     /**
@@ -41,13 +43,7 @@ public String getFilePattern() {
      * @return List of static code analysis
      */
     public static List<StaticCodeAnalysisTool> getToolsForProgrammingLanguage(ProgrammingLanguage language) {
-        List<StaticCodeAnalysisTool> tools = new ArrayList<>();
-        for (var tool : StaticCodeAnalysisTool.values()) {
-            if (tool.language == language) {
-                tools.add(tool);
-            }
-        }
-        return tools;
+        return TOOLS_OF_PROGRAMMING_LANGUAGE.getOrDefault(language, List.of());
     }
 
     /**
@@ -58,7 +54,7 @@ public static List<StaticCodeAnalysisTool> getToolsForProgrammingLanguage(Progra
      */
     public static Optional<StaticCodeAnalysisTool> getToolByFilePattern(String fileName) {
         for (StaticCodeAnalysisTool tool : StaticCodeAnalysisTool.values()) {
-            if (Objects.equals(fileName, tool.filePattern)) {
+            if (Objects.equals(fileName, tool.fileName)) {
                 return Optional.of(tool);
             }
         }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java
index 5a805ff54d03..d25304141c24 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java
@@ -1,5 +1,6 @@
 package de.tum.cit.aet.artemis.programming.service.localci;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import jakarta.annotation.PostConstruct;
@@ -20,7 +21,9 @@
 import com.hazelcast.map.listener.EntryUpdatedListener;
 
 import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation;
+import de.tum.cit.aet.artemis.buildagent.dto.BuildConfig;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem;
+import de.tum.cit.aet.artemis.buildagent.dto.RepositoryInfo;
 
 /**
  * This service is responsible for sending build job queue information over websockets.
@@ -68,18 +71,21 @@ public void init() {
     }
 
     private void sendQueuedJobsOverWebsocket(long courseId) {
-        localCIWebsocketMessagingService.sendQueuedBuildJobs(sharedQueueManagementService.getQueuedJobs());
-        localCIWebsocketMessagingService.sendQueuedBuildJobsForCourse(courseId, sharedQueueManagementService.getQueuedJobsForCourse(courseId));
+        var queuedJobs = removeUnnecessaryInformation(sharedQueueManagementService.getQueuedJobs());
+        var queuedJobsForCourse = queuedJobs.stream().filter(job -> job.courseId() == courseId).toList();
+        localCIWebsocketMessagingService.sendQueuedBuildJobs(queuedJobs);
+        localCIWebsocketMessagingService.sendQueuedBuildJobsForCourse(courseId, queuedJobsForCourse);
     }
 
     private void sendProcessingJobsOverWebsocket(long courseId) {
-        localCIWebsocketMessagingService.sendRunningBuildJobs(sharedQueueManagementService.getProcessingJobs());
-        localCIWebsocketMessagingService.sendRunningBuildJobsForCourse(courseId, sharedQueueManagementService.getProcessingJobsForCourse(courseId));
+        var processingJobs = removeUnnecessaryInformation(sharedQueueManagementService.getProcessingJobs());
+        var processingJobsForCourse = processingJobs.stream().filter(job -> job.courseId() == courseId).toList();
+        localCIWebsocketMessagingService.sendRunningBuildJobs(processingJobs);
+        localCIWebsocketMessagingService.sendRunningBuildJobsForCourse(courseId, processingJobsForCourse);
     }
 
     private void sendBuildAgentSummaryOverWebsocket() {
-        // remove the recentBuildJobs from the build agent information before sending it over the websocket
-        List<BuildAgentInformation> buildAgentSummary = sharedQueueManagementService.getBuildAgentInformationWithoutRecentBuildJobs();
+        var buildAgentSummary = removeUnnecessaryInformationFromBuildAgentInformation(sharedQueueManagementService.getBuildAgentInformationWithoutRecentBuildJobs());
         localCIWebsocketMessagingService.sendBuildAgentSummary(buildAgentSummary);
     }
 
@@ -142,4 +148,57 @@ public void entryUpdated(com.hazelcast.core.EntryEvent<String, BuildAgentInforma
             sendBuildAgentInformationOverWebsocket(event.getValue().buildAgent().name());
         }
     }
+
+    /**
+     * Removes unnecessary information (e.g. repository info, build config, result) from the queued jobs before sending them over the websocket.
+     *
+     * @param queuedJobs the queued jobs
+     */
+    private static List<BuildJobQueueItem> removeUnnecessaryInformation(List<BuildJobQueueItem> queuedJobs) {
+        var filteredQueuedJobs = new ArrayList<BuildJobQueueItem>(); // make list mutable in case it is not
+        for (BuildJobQueueItem job : queuedJobs) {
+            var buildConfig = removeUnnecessaryInformationFromBuildConfig(job.buildConfig());
+            var repositoryInfo = removeUnnecessaryInformationFromRepositoryInfo(job.repositoryInfo());
+            filteredQueuedJobs.add(new BuildJobQueueItem(job.id(), job.name(), job.buildAgent(), job.participationId(), job.courseId(), job.exerciseId(), job.retryCount(),
+                    job.priority(), job.status(), repositoryInfo, job.jobTimingInfo(), buildConfig, null));
+
+        }
+        return filteredQueuedJobs;
+    }
+
+    /**
+     * Removes unnecessary information (e.g. build script, docker image) from the build config before sending it over the websocket.
+     *
+     * @param buildConfig the build config
+     */
+    private static BuildConfig removeUnnecessaryInformationFromBuildConfig(BuildConfig buildConfig) {
+        // We pass "" instead of null strings to avoid errors when serializing to JSON
+        return new BuildConfig("", "", buildConfig.commitHashToBuild(), "", "", "", null, null, buildConfig.scaEnabled(), buildConfig.sequentialTestRunsEnabled(),
+                buildConfig.testwiseCoverageEnabled(), null, buildConfig.timeoutSeconds(), "", "", "");
+    }
+
+    /**
+     * Removes unnecessary information (RepositoryUris) from the repository info before sending it over the websocket.
+     *
+     * @param repositoryInfo the repository info
+     */
+    private static RepositoryInfo removeUnnecessaryInformationFromRepositoryInfo(RepositoryInfo repositoryInfo) {
+        // We pass "" instead of null strings to avoid errors when serializing to JSON
+        return new RepositoryInfo(repositoryInfo.repositoryName(), repositoryInfo.repositoryType(), repositoryInfo.triggeredByPushTo(), "", "", "", null, null);
+    }
+
+    /**
+     * Removes unnecessary information (e.g. recent build jobs, public ssh key, result) from the running jobs before sending them over the websocket.
+     *
+     * @param buildAgentSummary the build agent summary
+     */
+    private static List<BuildAgentInformation> removeUnnecessaryInformationFromBuildAgentInformation(List<BuildAgentInformation> buildAgentSummary) {
+        var filteredBuildAgentSummary = new ArrayList<BuildAgentInformation>(); // make list mutable in case it is not
+        for (BuildAgentInformation agent : buildAgentSummary) {
+            var runningJobs = removeUnnecessaryInformation(agent.runningBuildJobs());
+            filteredBuildAgentSummary.add(new BuildAgentInformation(agent.buildAgent(), agent.maxNumberOfConcurrentBuildJobs(), agent.numberOfCurrentBuildJobs(), runningJobs,
+                    agent.status(), null, null));
+        }
+        return filteredBuildAgentSummary;
+    }
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java
index e27ec440d5aa..f17ef965750c 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java
@@ -95,7 +95,6 @@ public void sendRunningBuildJobs(List<BuildJobQueueItem> buildJobQueue) {
     public void sendBuildAgentSummary(List<BuildAgentInformation> buildAgentInfo) {
         String channel = "/topic/admin/build-agents";
         log.debug("Sending message on topic {}: {}", channel, buildAgentInfo);
-        // TODO: convert into a proper DTO and strip unnecessary information, e.g. build config, because it's not shown in the client and contains too much information
         websocketMessagingService.sendMessage(channel, buildAgentInfo);
     }
 
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java
index 87b44d4872ba..f03325c503d8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java
@@ -108,36 +108,57 @@ public void pushDockerImageCleanupInfo() {
         }
     }
 
+    /**
+     * @return a copy of the queued build jobs as ArrayList
+     */
     public List<BuildJobQueueItem> getQueuedJobs() {
-        return queue.stream().toList();
+        // NOTE: we should not use streams with IQueue directly, because it can be unstable, when many items are added at the same time and there is a slow network condition
+        return new ArrayList<>(queue);
+    }
+
+    public int getQueuedJobsSize() {
+        return queue.size();
     }
 
+    /**
+     * @return a copy of the processing jobs as ArrayList
+     */
     public List<BuildJobQueueItem> getProcessingJobs() {
-        return processingJobs.values().stream().toList();
+        // NOTE: we should not use streams with IMap, because it can be unstable, when many items are added at the same time and there is a slow network condition
+        return new ArrayList<>(processingJobs.values());
+    }
+
+    public int getProcessingJobsSize() {
+        return processingJobs.size();
     }
 
     public List<BuildJobQueueItem> getQueuedJobsForCourse(long courseId) {
-        return queue.stream().filter(job -> job.courseId() == courseId).toList();
+        return getQueuedJobs().stream().filter(job -> job.courseId() == courseId).toList();
     }
 
     public List<BuildJobQueueItem> getProcessingJobsForCourse(long courseId) {
-        return processingJobs.values().stream().filter(job -> job.courseId() == courseId).toList();
+        return getProcessingJobs().stream().filter(job -> job.courseId() == courseId).toList();
     }
 
     public List<BuildJobQueueItem> getQueuedJobsForParticipation(long participationId) {
-        return queue.stream().filter(job -> job.participationId() == participationId).toList();
+        return getQueuedJobs().stream().filter(job -> job.participationId() == participationId).toList();
     }
 
     public List<BuildJobQueueItem> getProcessingJobsForParticipation(long participationId) {
-        return processingJobs.values().stream().filter(job -> job.participationId() == participationId).toList();
+        return getProcessingJobs().stream().filter(job -> job.participationId() == participationId).toList();
     }
 
     public List<BuildAgentInformation> getBuildAgentInformation() {
-        return buildAgentInformation.values().stream().toList();
+        // NOTE: we should not use streams with IMap, because it can be unstable, when many items are added at the same time and there is a slow network condition
+        return new ArrayList<>(buildAgentInformation.values());
+    }
+
+    public int getBuildAgentInformationSize() {
+        return buildAgentInformation.size();
     }
 
     public List<BuildAgentInformation> getBuildAgentInformationWithoutRecentBuildJobs() {
-        return buildAgentInformation.values().stream().map(agent -> new BuildAgentInformation(agent.buildAgent(), agent.maxNumberOfConcurrentBuildJobs(),
+        return getBuildAgentInformation().stream().map(agent -> new BuildAgentInformation(agent.buildAgent(), agent.maxNumberOfConcurrentBuildJobs(),
                 agent.numberOfCurrentBuildJobs(), agent.runningBuildJobs(), agent.status(), null, null)).toList();
     }
 
@@ -145,10 +166,18 @@ public void pauseBuildAgent(String agent) {
         pauseBuildAgentTopic.publish(agent);
     }
 
+    public void pauseAllBuildAgents() {
+        getBuildAgentInformation().forEach(agent -> pauseBuildAgent(agent.buildAgent().name()));
+    }
+
     public void resumeBuildAgent(String agent) {
         resumeBuildAgentTopic.publish(agent);
     }
 
+    public void resumeAllBuildAgents() {
+        getBuildAgentInformation().forEach(agent -> resumeBuildAgent(agent.buildAgent().name()));
+    }
+
     /**
      * Cancel a build job by removing it from the queue or stopping the build process.
      *
@@ -156,9 +185,10 @@ public void resumeBuildAgent(String agent) {
      */
     public void cancelBuildJob(String buildJobId) {
         // Remove build job if it is queued
-        if (queue.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) {
+        List<BuildJobQueueItem> queuedJobs = getQueuedJobs();
+        if (queuedJobs.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) {
             List<BuildJobQueueItem> toRemove = new ArrayList<>();
-            for (BuildJobQueueItem job : queue) {
+            for (BuildJobQueueItem job : queuedJobs) {
                 if (Objects.equals(job.id(), buildJobId)) {
                     toRemove.add(job);
                 }
@@ -197,7 +227,8 @@ public void cancelAllQueuedBuildJobs() {
      * Cancel all running build jobs.
      */
     public void cancelAllRunningBuildJobs() {
-        for (BuildJobQueueItem buildJob : processingJobs.values()) {
+        List<BuildJobQueueItem> runningJobs = getProcessingJobs();
+        for (BuildJobQueueItem buildJob : runningJobs) {
             cancelBuildJob(buildJob.id());
         }
     }
@@ -208,7 +239,7 @@ public void cancelAllRunningBuildJobs() {
      * @param agentName name of the agent
      */
     public void cancelAllRunningBuildJobsForAgent(String agentName) {
-        processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgent().name(), agentName)).forEach(job -> cancelBuildJob(job.id()));
+        getProcessingJobs().stream().filter(job -> Objects.equals(job.buildAgent().name(), agentName)).forEach(job -> cancelBuildJob(job.id()));
     }
 
     /**
@@ -217,8 +248,9 @@ public void cancelAllRunningBuildJobsForAgent(String agentName) {
      * @param courseId id of the course
      */
     public void cancelAllQueuedBuildJobsForCourse(long courseId) {
+        List<BuildJobQueueItem> queuedJobs = getQueuedJobs();
         List<BuildJobQueueItem> toRemove = new ArrayList<>();
-        for (BuildJobQueueItem job : queue) {
+        for (BuildJobQueueItem job : queuedJobs) {
             if (job.courseId() == courseId) {
                 toRemove.add(job);
             }
@@ -232,7 +264,8 @@ public void cancelAllQueuedBuildJobsForCourse(long courseId) {
      * @param courseId id of the course
      */
     public void cancelAllRunningBuildJobsForCourse(long courseId) {
-        for (BuildJobQueueItem buildJob : processingJobs.values()) {
+        List<BuildJobQueueItem> runningJobs = getProcessingJobs();
+        for (BuildJobQueueItem buildJob : runningJobs) {
             if (buildJob.courseId() == courseId) {
                 cancelBuildJob(buildJob.id());
             }
@@ -246,14 +279,16 @@ public void cancelAllRunningBuildJobsForCourse(long courseId) {
      */
     public void cancelAllJobsForParticipation(long participationId) {
         List<BuildJobQueueItem> toRemove = new ArrayList<>();
-        for (BuildJobQueueItem queuedJob : queue) {
+        List<BuildJobQueueItem> queuedJobs = getQueuedJobs();
+        for (BuildJobQueueItem queuedJob : queuedJobs) {
             if (queuedJob.participationId() == participationId) {
                 toRemove.add(queuedJob);
             }
         }
         queue.removeAll(toRemove);
 
-        for (BuildJobQueueItem runningJob : processingJobs.values()) {
+        List<BuildJobQueueItem> runningJobs = getProcessingJobs();
+        for (BuildJobQueueItem runningJob : runningJobs) {
             if (runningJob.participationId() == participationId) {
                 cancelBuildJob(runningJob.id());
             }
@@ -288,5 +323,4 @@ public Page<BuildJob> getFilteredFinishedBuildJobs(FinishedBuildJobPageableSearc
 
         return new PageImpl<>(orderedBuildJobs, buildJobIdsPage.getPageable(), buildJobIdsPage.getTotalElements());
     }
-
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java
index 9b8f59766ac2..f31cbcd0c63e 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java
@@ -1,94 +1,27 @@
 package de.tum.cit.aet.artemis.programming.service.localci.scaparser;
 
-import static de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.ReportUtils.createErrorReport;
-import static de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.ReportUtils.createFileTooLargeReport;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO;
-import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.ParserException;
 import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException;
 import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserPolicy;
 import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserStrategy;
-import de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.FileUtils;
 
 /**
  * Public API for parsing of static code analysis reports
  */
 public class ReportParser {
 
-    private final ObjectMapper mapper = new ObjectMapper();
-
-    // Reports that are bigger then the threshold will not be parsed
-    // and an issue will be generated. The unit is in megabytes.
-    private static final int STATIC_CODE_ANALYSIS_REPORT_FILESIZE_LIMIT_IN_MB = 1;
-
-    /**
-     * Transform a given static code analysis report into a JSON representation.
-     * All supported tools share the same JSON format.
-     *
-     * @param file Reference to the static code analysis report
-     * @return Static code analysis report represented as a JSON String
-     * @throws ParserException - If an exception occurs that is not already handled by the parser itself, e.g. caused by the json-parsing
-     */
-    public String transformToJSONReport(File file) throws ParserException {
-        try {
-            StaticCodeAnalysisReportDTO report = transformToReport(file);
-            return mapper.writeValueAsString(report);
-        }
-        catch (Exception e) {
-            throw new ParserException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Transform a given static code analysis report given as a file into a plain Java object.
-     *
-     * @param file Reference to the static code analysis report
-     * @return Static code analysis report represented as a plain Java object
-     */
-    public StaticCodeAnalysisReportDTO transformToReport(File file) {
-        if (file == null) {
-            throw new IllegalArgumentException("File must not be null");
-        }
-
-        // The static code analysis parser only supports xml files.
-        if (!FileUtils.getExtension(file).equals("xml")) {
-            throw new IllegalArgumentException("File must be xml format");
-        }
-        try {
-            // Reject any file larger than the given threshold
-            if (FileUtils.isFilesizeGreaterThan(file, STATIC_CODE_ANALYSIS_REPORT_FILESIZE_LIMIT_IN_MB)) {
-                return createFileTooLargeReport(file.getName());
-            }
-
-            return getReport(file);
-        }
-        catch (Exception e) {
-            return createErrorReport(file.getName(), e);
-        }
-    }
+    private static final ParserPolicy parserPolicy = new ParserPolicy();
 
     /**
-     * Builds the document using the provided file and parses it to a Report object using ObjectMapper.
+     * Builds the document using the provided string and parses it to a Report object.
      *
-     * @param file File referencing the static code analysis report
+     * @param reportContent String containing the static code analysis report
+     * @param fileName      filename of the report used for configuring a parser
      * @return Report containing the static code analysis issues
      * @throws UnsupportedToolException if the static code analysis tool which created the report is not supported
-     * @throws IOException              if the file could not be read
      */
-    public static StaticCodeAnalysisReportDTO getReport(File file) throws IOException {
-        String xmlContent = Files.readString(file.toPath());
-        return getReport(xmlContent, file.getName());
-    }
-
-    public static StaticCodeAnalysisReportDTO getReport(String xmlContent, String fileName) {
-        ParserPolicy parserPolicy = new ParserPolicy();
+    public static StaticCodeAnalysisReportDTO getReport(String reportContent, String fileName) {
         ParserStrategy parserStrategy = parserPolicy.configure(fileName);
-        return parserStrategy.parse(xmlContent);
+        return parserStrategy.parse(reportContent);
     }
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/ParserException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/ParserException.java
deleted file mode 100644
index f0934ad041f3..000000000000
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/ParserException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception;
-
-/**
- * Exception thrown when an error occurs during parsing.
- */
-public class ParserException extends Exception {
-
-    /**
-     * Creates a new ParserException.
-     *
-     * @param message the detail message.
-     */
-    public ParserException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ArtifactLocation.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ArtifactLocation.java
new file mode 100644
index 000000000000..ab497fc272d9
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ArtifactLocation.java
@@ -0,0 +1,22 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Specifies the location of an artifact.
+ *
+ * @param uri A string containing a valid relative or absolute URI.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ArtifactLocation(String uri) {
+
+    /**
+     * A string containing a valid relative or absolute URI.
+     */
+    public Optional<String> getOptionalUri() {
+        return Optional.ofNullable(uri);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/GlobalMessageStrings.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/GlobalMessageStrings.java
new file mode 100644
index 000000000000..04293695820b
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/GlobalMessageStrings.java
@@ -0,0 +1,14 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+/**
+ * A dictionary, each of whose keys is a resource identifier and each of whose values is a multiformatMessageString object, which holds message strings in plain text and
+ * (optionally) Markdown format. The strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string
+ * arguments.
+ */
+public record GlobalMessageStrings(@JsonAnySetter Map<String, MultiformatMessageString> additionalProperties) {
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Location.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Location.java
new file mode 100644
index 000000000000..20dbd72ef99d
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Location.java
@@ -0,0 +1,23 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * A location within a programming artifact.
+ *
+ * @param physicalLocation A physical location relevant to a result. Specifies a reference to a programming artifact together with a range of bytes or characters within that
+ *                             artifact.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record Location(PhysicalLocation physicalLocation) {
+
+    /**
+     * A physical location relevant to a result. Specifies a reference to a programming artifact together with a range of bytes or characters within that artifact.
+     */
+    public Optional<PhysicalLocation> getOptionalPhysicalLocation() {
+        return Optional.ofNullable(physicalLocation);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Message.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Message.java
new file mode 100644
index 000000000000..d353df2e203e
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Message.java
@@ -0,0 +1,30 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Encapsulates a message intended to be read by the end user.
+ *
+ * @param text A plain text message string.
+ * @param id   The identifier for this message.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record Message(String text, String id) {
+
+    /**
+     * A plain text message string.
+     */
+    public Optional<String> getOptionalText() {
+        return Optional.ofNullable(text);
+    }
+
+    /**
+     * The identifier for this message.
+     */
+    public Optional<String> getOptionalId() {
+        return Optional.ofNullable(id);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/MessageStrings.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/MessageStrings.java
new file mode 100644
index 000000000000..a888c306bcee
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/MessageStrings.java
@@ -0,0 +1,13 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+/**
+ * A set of name/value pairs with arbitrary names. Each value is a multiformatMessageString object, which holds message strings in plain text and (optionally) Markdown format. The
+ * strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string arguments.
+ */
+public record MessageStrings(@JsonAnySetter Map<String, MultiformatMessageString> additionalProperties) {
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/MultiformatMessageString.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/MultiformatMessageString.java
new file mode 100644
index 000000000000..a08afe804d02
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/MultiformatMessageString.java
@@ -0,0 +1,13 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * A message string or message format string rendered in multiple formats.
+ *
+ * @param text A plain text message string or format string.
+ *                 (Required)
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record MultiformatMessageString(String text) {
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/PhysicalLocation.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/PhysicalLocation.java
new file mode 100644
index 000000000000..b122875e94be
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/PhysicalLocation.java
@@ -0,0 +1,30 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * A physical location relevant to a result. Specifies a reference to a programming artifact together with a range of bytes or characters within that artifact.
+ *
+ * @param artifactLocation Specifies the location of an artifact.
+ * @param region           A region within an artifact where a result was detected.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record PhysicalLocation(ArtifactLocation artifactLocation, Region region) {
+
+    /**
+     * Specifies the location of an artifact.
+     */
+    public Optional<ArtifactLocation> getOptionalArtifactLocation() {
+        return Optional.ofNullable(artifactLocation);
+    }
+
+    /**
+     * A region within an artifact where a result was detected.
+     */
+    public Optional<Region> getOptionalRegion() {
+        return Optional.ofNullable(region);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/PropertyBag.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/PropertyBag.java
new file mode 100644
index 000000000000..ba3b0bb208fb
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/PropertyBag.java
@@ -0,0 +1,14 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Key/value pairs that provide additional information about the object.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record PropertyBag(@JsonAnySetter Map<String, Object> additionalProperties) {
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Region.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Region.java
new file mode 100644
index 000000000000..f9ac3391df87
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Region.java
@@ -0,0 +1,46 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * A region within an artifact where a result was detected.
+ *
+ * @param startLine   The line number of the first character in the region.
+ * @param startColumn The column number of the first character in the region.
+ * @param endLine     The line number of the last character in the region.
+ * @param endColumn   The column number of the character following the end of the region.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record Region(Integer startLine, Integer startColumn, Integer endLine, Integer endColumn) {
+
+    /**
+     * The line number of the first character in the region.
+     */
+    public Optional<Integer> getOptionalStartLine() {
+        return Optional.ofNullable(startLine);
+    }
+
+    /**
+     * The column number of the first character in the region.
+     */
+    public Optional<Integer> getOptionalStartColumn() {
+        return Optional.ofNullable(startColumn);
+    }
+
+    /**
+     * The line number of the last character in the region.
+     */
+    public Optional<Integer> getOptionalEndLine() {
+        return Optional.ofNullable(endLine);
+    }
+
+    /**
+     * The column number of the character following the end of the region.
+     */
+    public Optional<Integer> getOptionalEndColumn() {
+        return Optional.ofNullable(endColumn);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ReportingDescriptor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ReportingDescriptor.java
new file mode 100644
index 000000000000..75552ee32d69
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ReportingDescriptor.java
@@ -0,0 +1,112 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.net.URI;
+import java.util.Optional;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Metadata that describes a specific report produced by the tool, as part of the analysis it provides or its runtime reporting.
+ *
+ * @param id               A stable, opaque identifier for the report.
+ *                             (Required)
+ * @param deprecatedIds    An array of stable, opaque identifiers by which this report was known in some previous version of the analysis tool.
+ * @param guid             A unique identifier for the reporting descriptor in the form of a GUID.
+ * @param deprecatedGuids  An array of unique identifies in the form of a GUID by which this report was known in some previous version of the analysis tool.
+ * @param name             A report identifier that is understandable to an end user.
+ * @param deprecatedNames  An array of readable identifiers by which this report was known in some previous version of the analysis tool.
+ * @param shortDescription A message string or message format string rendered in multiple formats.
+ * @param fullDescription  A message string or message format string rendered in multiple formats.
+ * @param messageStrings   A set of name/value pairs with arbitrary names. Each value is a multiformatMessageString object, which holds message strings in plain text and
+ *                             (optionally) Markdown format.
+ *                             The strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string
+ *                             arguments.
+ * @param helpUri          A URI where the primary documentation for the report can be found.
+ * @param help             A message string or message format string rendered in multiple formats.
+ * @param properties       Key/value pairs that provide additional information about the object.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ReportingDescriptor(String id, Set<String> deprecatedIds, String guid, Set<String> deprecatedGuids, String name, Set<String> deprecatedNames,
+        MultiformatMessageString shortDescription, MultiformatMessageString fullDescription, MessageStrings messageStrings, URI helpUri, MultiformatMessageString help,
+        PropertyBag properties) {
+
+    /**
+     * An array of stable, opaque identifiers by which this report was known in some previous version of the analysis tool.
+     */
+    public Optional<Set<String>> getOptionalDeprecatedIds() {
+        return Optional.ofNullable(deprecatedIds);
+    }
+
+    /**
+     * A unique identifier for the reporting descriptor in the form of a GUID.
+     */
+    public Optional<String> getOptionalGuid() {
+        return Optional.ofNullable(guid);
+    }
+
+    /**
+     * An array of unique identifies in the form of a GUID by which this report was known in some previous version of the analysis tool.
+     */
+    public Optional<Set<String>> getOptionalDeprecatedGuids() {
+        return Optional.ofNullable(deprecatedGuids);
+    }
+
+    /**
+     * A report identifier that is understandable to an end user.
+     */
+    public Optional<String> getOptionalName() {
+        return Optional.ofNullable(name);
+    }
+
+    /**
+     * An array of readable identifiers by which this report was known in some previous version of the analysis tool.
+     */
+    public Optional<Set<String>> getOptionalDeprecatedNames() {
+        return Optional.ofNullable(deprecatedNames);
+    }
+
+    /**
+     * A message string or message format string rendered in multiple formats.
+     */
+    public Optional<MultiformatMessageString> getOptionalShortDescription() {
+        return Optional.ofNullable(shortDescription);
+    }
+
+    /**
+     * A message string or message format string rendered in multiple formats.
+     */
+    public Optional<MultiformatMessageString> getOptionalFullDescription() {
+        return Optional.ofNullable(fullDescription);
+    }
+
+    /**
+     * A set of name/value pairs with arbitrary names. Each value is a multiformatMessageString object, which holds message strings in plain text and (optionally) Markdown format.
+     * The strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string arguments.
+     */
+    public Optional<MessageStrings> getOptionalMessageStrings() {
+        return Optional.ofNullable(messageStrings);
+    }
+
+    /**
+     * A URI where the primary documentation for the report can be found.
+     */
+    public Optional<URI> getOptionalHelpUri() {
+        return Optional.ofNullable(helpUri);
+    }
+
+    /**
+     * A message string or message format string rendered in multiple formats.
+     */
+    public Optional<MultiformatMessageString> getOptionalHelp() {
+        return Optional.ofNullable(help);
+    }
+
+    /**
+     * Key/value pairs that provide additional information about the object.
+     */
+    public Optional<PropertyBag> getOptionalProperties() {
+        return Optional.ofNullable(properties);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ReportingDescriptorReference.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ReportingDescriptorReference.java
new file mode 100644
index 000000000000..f46e722e6b1b
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ReportingDescriptorReference.java
@@ -0,0 +1,37 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Information about how to locate a relevant reporting descriptor.
+ *
+ * @param id    The id of the descriptor.
+ * @param index The index into an array of descriptors in toolComponent.ruleDescriptors, toolComponent.notificationDescriptors, or toolComponent.taxonomyDescriptors, depending on
+ *                  context.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ReportingDescriptorReference(String id, Integer index) {
+
+    public ReportingDescriptorReference(String id, Integer index) {
+        this.id = id;
+        this.index = Objects.requireNonNullElse(index, -1);
+    }
+
+    /**
+     * The id of the descriptor.
+     */
+    public Optional<String> getOptionalId() {
+        return Optional.ofNullable(id);
+    }
+
+    /**
+     * The index into an array of descriptors in toolComponent.ruleDescriptors, toolComponent.notificationDescriptors, or toolComponent.taxonomyDescriptors, depending on context.
+     */
+    public Optional<Integer> getOptionalIndex() {
+        return Optional.ofNullable(index);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Result.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Result.java
new file mode 100644
index 000000000000..49d17e49649a
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Result.java
@@ -0,0 +1,171 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * A result produced by an analysis tool.
+ *
+ * @param ruleId    The stable, unique identifier of the rule, if any, to which this result is relevant.
+ * @param ruleIndex The index within the tool component rules array of the rule object associated with this result.
+ * @param rule      Information about how to locate a relevant reporting descriptor.
+ * @param kind      A value that categorizes results by evaluation state.
+ * @param level     A value specifying the severity level of the result.
+ * @param message   A message that describes the result. The first sentence of the message only will be displayed when visible space is limited.
+ * @param locations The set of locations where the result was detected. Specify only one location unless the problem indicated by the result can only be corrected by making a
+ *                      change at every specified location.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record Result(String ruleId, Integer ruleIndex, ReportingDescriptorReference rule,
+        de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.Result.Kind kind,
+        de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.Result.Level level, Message message, List<Location> locations) {
+
+    public Result(String ruleId, Integer ruleIndex, ReportingDescriptorReference rule, Kind kind, Level level, Message message, List<Location> locations) {
+        this.ruleId = ruleId;
+        this.ruleIndex = Objects.requireNonNullElse(ruleIndex, -1);
+        this.rule = rule;
+        this.kind = Objects.requireNonNullElse(kind, Kind.FAIL);
+        this.level = Objects.requireNonNullElse(level, Level.WARNING);
+        this.message = message;
+        this.locations = locations;
+    }
+
+    /**
+     * The stable, unique identifier of the rule, if any, to which this result is relevant.
+     */
+    public Optional<String> getOptionalRuleId() {
+        return Optional.ofNullable(ruleId);
+    }
+
+    /**
+     * The index within the tool component rules array of the rule object associated with this result.
+     */
+    public Optional<Integer> getOptionalRuleIndex() {
+        return Optional.ofNullable(ruleIndex);
+    }
+
+    /**
+     * Information about how to locate a relevant reporting descriptor.
+     */
+    public Optional<ReportingDescriptorReference> getOptionalRule() {
+        return Optional.ofNullable(rule);
+    }
+
+    /**
+     * A value that categorizes results by evaluation state.
+     */
+    public Optional<Kind> getOptionalKind() {
+        return Optional.ofNullable(kind);
+    }
+
+    /**
+     * A value specifying the severity level of the result.
+     */
+    public Optional<Level> getOptionalLevel() {
+        return Optional.ofNullable(level);
+    }
+
+    /**
+     * The set of locations where the result was detected. Specify only one location unless the problem indicated by the result can only be corrected by making a change at every
+     * specified location.
+     */
+    public Optional<List<Location>> getOptionalLocations() {
+        return Optional.ofNullable(locations);
+    }
+
+    /**
+     * A value that categorizes results by evaluation state.
+     */
+    public enum Kind {
+
+        NOT_APPLICABLE("notApplicable"), PASS("pass"), FAIL("fail"), REVIEW("review"), OPEN("open"), INFORMATIONAL("informational");
+
+        private final String value;
+
+        private final static Map<String, Kind> CONSTANTS = new HashMap<>();
+
+        static {
+            for (Kind c : values()) {
+                CONSTANTS.put(c.value, c);
+            }
+        }
+
+        Kind(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+
+        @JsonValue
+        public String value() {
+            return this.value;
+        }
+
+        @JsonCreator
+        public static Kind fromValue(String value) {
+            Kind constant = CONSTANTS.get(value);
+            if (constant == null) {
+                throw new IllegalArgumentException(value);
+            }
+            else {
+                return constant;
+            }
+        }
+
+    }
+
+    /**
+     * A value specifying the severity level of the result.
+     */
+    public enum Level {
+
+        NONE("none"), NOTE("note"), WARNING("warning"), ERROR("error");
+
+        private final String value;
+
+        private final static Map<String, Level> CONSTANTS = new HashMap<>();
+
+        static {
+            for (Level c : values()) {
+                CONSTANTS.put(c.value, c);
+            }
+        }
+
+        Level(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+
+        @JsonValue
+        public String value() {
+            return this.value;
+        }
+
+        @JsonCreator
+        public static Level fromValue(String value) {
+            Level constant = CONSTANTS.get(value);
+            if (constant == null) {
+                throw new IllegalArgumentException(value);
+            }
+            else {
+                return constant;
+            }
+        }
+
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Run.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Run.java
new file mode 100644
index 000000000000..c77d9ccaee4b
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Run.java
@@ -0,0 +1,27 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Describes a single run of an analysis tool, and contains the reported output of that run.
+ *
+ * @param tool    The analysis tool that was run.
+ *                    (Required)
+ * @param results The set of results contained in an SARIF log. The results array can be omitted when a run is solely exporting rules metadata. It must be present (but may be
+ *                    empty) if a log file represents an actual scan.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record Run(Tool tool, List<Result> results) {
+
+    /**
+     * The set of results contained in an SARIF log. The results array can be omitted when a run is solely exporting rules metadata. It must be present (but may be empty) if a log
+     * file represents an actual scan.
+     */
+    public Optional<List<Result>> getOptionalResults() {
+        return Optional.ofNullable(results);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/SarifLog.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/SarifLog.java
new file mode 100644
index 000000000000..28efb3370c53
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/SarifLog.java
@@ -0,0 +1,18 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema
+ * <p>
+ * Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema: a standard format for the output of static analysis tools.
+ *
+ * @param runs The set of runs contained in this log file.
+ *                 (Required)
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SarifLog(List<Run> runs) {
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Tool.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Tool.java
new file mode 100644
index 000000000000..d6af4c944ba3
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/Tool.java
@@ -0,0 +1,13 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * The analysis tool that was run.
+ *
+ * @param driver A component, such as a plug-in or the driver, of the analysis tool that was run.
+ *                   (Required)
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record Tool(ToolComponent driver) {
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ToolComponent.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ToolComponent.java
new file mode 100644
index 000000000000..b7fb4cf33d3e
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/format/sarif/ToolComponent.java
@@ -0,0 +1,37 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * A component, such as a plug-in or the driver, of the analysis tool that was run.
+ *
+ * @param name                 The name of the tool component.
+ *                                 (Required)
+ * @param globalMessageStrings A dictionary, each of whose keys is a resource identifier and each of whose values is a multiformatMessageString object, which holds message strings
+ *                                 in plain text and (optionally) Markdown format. The strings can include placeholders, which can be used to construct a message in combination
+ *                                 with an arbitrary number of additional string arguments.
+ * @param rules                An array of reportingDescriptor objects relevant to the analysis performed by the tool component.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ToolComponent(String name, GlobalMessageStrings globalMessageStrings, List<ReportingDescriptor> rules) {
+
+    /**
+     * A dictionary, each of whose keys is a resource identifier and each of whose values is a multiformatMessageString object, which holds message strings in plain text and
+     * (optionally) Markdown format. The strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string
+     * arguments.
+     */
+    public Optional<GlobalMessageStrings> getOptionalGlobalMessageStrings() {
+        return Optional.ofNullable(globalMessageStrings);
+    }
+
+    /**
+     * An array of reportingDescriptor objects relevant to the analysis performed by the tool component.
+     */
+    public Optional<List<ReportingDescriptor>> getOptionalRules() {
+        return Optional.ofNullable(rules);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java
index e50be8d57997..f9fe1b9d90ba 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java
@@ -40,9 +40,9 @@ public class CheckstyleParser implements ParserStrategy {
     private final XmlMapper xmlMapper = new XmlMapper();
 
     @Override
-    public StaticCodeAnalysisReportDTO parse(String xmlContent) {
+    public StaticCodeAnalysisReportDTO parse(String reportContent) {
         try {
-            List<CheckstyleFile> files = xmlMapper.readValue(xmlContent, new com.fasterxml.jackson.core.type.TypeReference<List<CheckstyleFile>>() {
+            List<CheckstyleFile> files = xmlMapper.readValue(reportContent, new com.fasterxml.jackson.core.type.TypeReference<List<CheckstyleFile>>() {
             });
             return createReportFromFiles(files);
         }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java
index 11fbab145fd4..b5da7a65fdf0 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java
@@ -43,9 +43,9 @@ class PMDCPDParser implements ParserStrategy {
     private final XmlMapper xmlMapper = new XmlMapper();
 
     @Override
-    public StaticCodeAnalysisReportDTO parse(String xmlContent) {
+    public StaticCodeAnalysisReportDTO parse(String reportContent) {
         try {
-            PmdCpc duplication = xmlMapper.readValue(xmlContent, PmdCpc.class);
+            PmdCpc duplication = xmlMapper.readValue(reportContent, PmdCpc.class);
             return createReportFromDuplication(duplication);
         }
         catch (IOException e) {
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java
index ee7ce091b37b..7c7951630dc3 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java
@@ -45,9 +45,9 @@ class PMDParser implements ParserStrategy {
     private final XmlMapper xmlMapper = new XmlMapper();
 
     @Override
-    public StaticCodeAnalysisReportDTO parse(String xmlContent) {
+    public StaticCodeAnalysisReportDTO parse(String reportContent) {
         try {
-            PMDReport pmdReport = xmlMapper.readValue(xmlContent, PMDReport.class);
+            PMDReport pmdReport = xmlMapper.readValue(reportContent, PMDReport.class);
             return createReportFromPMDReport(pmdReport);
         }
         catch (IOException e) {
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java
index ea7e8e356179..cee6ca946062 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java
@@ -12,10 +12,10 @@ static String transformToUnixPath(String path) {
     }
 
     /**
-     * Parse a static code analysis report from an XML string into a common Java representation.
+     * Parse a static code analysis report from a serialized string into a common Java representation.
      *
-     * @param xmlContent The XML content as a String
+     * @param reportContent The serialized content as a String
      * @return Report object containing the parsed report information
      */
-    StaticCodeAnalysisReportDTO parse(String xmlContent);
+    StaticCodeAnalysisReportDTO parse(String reportContent);
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java
index f4db7cbb351b..51e5e3f2cee5 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java
@@ -49,9 +49,9 @@ class SpotbugsParser implements ParserStrategy {
     private final XmlMapper xmlMapper = new XmlMapper();
 
     @Override
-    public StaticCodeAnalysisReportDTO parse(String xmlContent) {
+    public StaticCodeAnalysisReportDTO parse(String reportContent) {
         try {
-            BugCollection bugCollection = xmlMapper.readValue(xmlContent, BugCollection.class);
+            BugCollection bugCollection = xmlMapper.readValue(reportContent, BugCollection.class);
             return createReportFromBugCollection(bugCollection);
         }
         catch (IOException e) {
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/IdCategorizer.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/IdCategorizer.java
new file mode 100644
index 000000000000..646780fee2f5
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/IdCategorizer.java
@@ -0,0 +1,11 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.sarif;
+
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ReportingDescriptor;
+
+class IdCategorizer implements RuleCategorizer {
+
+    @Override
+    public String categorizeRule(ReportingDescriptor rule) {
+        return rule.id();
+    }
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/RuleCategorizer.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/RuleCategorizer.java
new file mode 100644
index 000000000000..46898ec5d9c4
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/RuleCategorizer.java
@@ -0,0 +1,14 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.sarif;
+
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ReportingDescriptor;
+
+public interface RuleCategorizer {
+
+    /**
+     * Categorizes a SARIF rule using a tool specific strategy.
+     *
+     * @param rule The reporting descriptor containing the rule details
+     * @return The identifier of the resulting category
+     */
+    String categorizeRule(ReportingDescriptor rule);
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/SarifParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/SarifParser.java
new file mode 100644
index 000000000000..46905fa6ed01
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/SarifParser.java
@@ -0,0 +1,185 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.sarif;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool;
+import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue;
+import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ArtifactLocation;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.GlobalMessageStrings;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.Location;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.MessageStrings;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.PhysicalLocation;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.Region;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ReportingDescriptor;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ReportingDescriptorReference;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.Result;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.Run;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.SarifLog;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ToolComponent;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserStrategy;
+
+/**
+ * Implements parts of the SARIF OASIS standard version 2.1.0.
+ *
+ * @see <a href="https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html">SARIF specification</a>
+ */
+public class SarifParser implements ParserStrategy {
+
+    private static final Logger log = LoggerFactory.getLogger(SarifParser.class);
+
+    private static class SarifFormatException extends RuntimeException {
+
+        private SarifFormatException(String message) {
+            super(message);
+        }
+    }
+
+    private static class InformationMissingException extends RuntimeException {
+
+        private InformationMissingException(String message) {
+            super(message);
+        }
+    }
+
+    private record FileLocation(String path, int startLine, int endLine, int startColumn, int endColumn) {
+    }
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final StaticCodeAnalysisTool tool;
+
+    private final RuleCategorizer ruleCategorizer;
+
+    public SarifParser(StaticCodeAnalysisTool tool, RuleCategorizer ruleCategorizer) {
+        this.tool = tool;
+        this.ruleCategorizer = ruleCategorizer;
+    }
+
+    @Override
+    public StaticCodeAnalysisReportDTO parse(String reportContent) {
+        SarifLog sarifLog;
+        try {
+            sarifLog = objectMapper.readValue(reportContent, SarifLog.class);
+        }
+        catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+        Run run = sarifLog.runs().getFirst();
+        ToolComponent driver = run.tool().driver();
+
+        List<ReportingDescriptor> rules = driver.getOptionalRules().orElse(List.of());
+
+        // Rule ids are not guaranteed to be unique. Use the first occurring for rule lookup.
+        Map<String, ReportingDescriptor> ruleOfId = rules.stream().collect(Collectors.toMap(ReportingDescriptor::id, Function.identity(), (first, next) -> first));
+
+        List<Result> results = run.getOptionalResults().orElse(List.of());
+        List<StaticCodeAnalysisIssue> issues = results.stream().map(result -> tryProcessResult(result, driver, ruleOfId)).filter(Objects::nonNull).toList();
+
+        return new StaticCodeAnalysisReportDTO(tool, issues);
+    }
+
+    private StaticCodeAnalysisIssue tryProcessResult(Result result, ToolComponent driver, Map<String, ReportingDescriptor> ruleOfId) {
+        try {
+            return processResult(result, driver, ruleOfId);
+        }
+        catch (SarifFormatException | NullPointerException e) {
+            log.error("The result is malformed", e);
+            return null;
+        }
+        catch (InformationMissingException e) {
+            log.warn("The result does not contain required information", e);
+            return null;
+        }
+    }
+
+    private StaticCodeAnalysisIssue processResult(Result result, ToolComponent driver, Map<String, ReportingDescriptor> ruleOfId) throws SarifFormatException {
+        FileLocation fileLocation = result.getOptionalLocations().flatMap(locations -> locations.stream().findFirst()).flatMap(Location::getOptionalPhysicalLocation)
+                .map(this::extractLocation).orElseThrow(() -> new InformationMissingException("Location needed"));
+
+        String ruleId = getRuleId(result);
+
+        Optional<Integer> ruleIndex = getRuleIndex(result);
+
+        Optional<ReportingDescriptor> ruleByIndex = driver.getOptionalRules().flatMap(rules -> ruleIndex.map(rules::get));
+        Optional<ReportingDescriptor> rule = ruleByIndex.or(() -> lookupRuleById(ruleId, ruleOfId));
+
+        // Fallback to the rule identifier for the category
+        String category = rule.map(ruleCategorizer::categorizeRule).orElse(ruleId);
+
+        Result.Level level = result.getOptionalLevel().orElse(Result.Level.WARNING);
+
+        String message = findMessage(result, driver, rule);
+
+        return new StaticCodeAnalysisIssue(fileLocation.path(), fileLocation.startLine(), fileLocation.endLine(), fileLocation.startColumn(), fileLocation.endColumn(), ruleId,
+                category, message, level.toString(), null);
+    }
+
+    private FileLocation extractLocation(PhysicalLocation location) {
+        URI uri = URI
+                .create(location.getOptionalArtifactLocation().flatMap(ArtifactLocation::getOptionalUri).orElseThrow(() -> new InformationMissingException("File path needed")));
+
+        Region region = location.getOptionalRegion().orElseThrow(() -> new SarifFormatException("Region must be present"));
+
+        int startLine = region.getOptionalStartLine().orElseThrow(() -> new InformationMissingException("Text region needed"));
+        int startColumn = region.getOptionalStartColumn().orElse(1);
+        int endLine = region.getOptionalEndLine().orElse(startLine);
+        int endColumn = region.getOptionalEndColumn().orElse(startColumn + 1);
+
+        return new FileLocation(uri.getPath(), startLine, endLine, startColumn, endColumn);
+    }
+
+    private static String getRuleId(Result result) throws SarifFormatException {
+        return result.getOptionalRuleId().orElseGet(() -> result.getOptionalRule().flatMap(ReportingDescriptorReference::getOptionalId)
+                .orElseThrow(() -> new SarifFormatException("Either ruleId or rule.id must be present")));
+    }
+
+    private static Optional<Integer> getRuleIndex(Result result) {
+        // ruleIndex can use -1 to indicate a missing value
+        Optional<Integer> ruleIndexOrMinusOne = result.getOptionalRuleIndex().or(() -> result.getOptionalRule().flatMap(ReportingDescriptorReference::getOptionalIndex));
+        return ruleIndexOrMinusOne.flatMap(index -> index != -1 ? Optional.of(index) : Optional.empty());
+    }
+
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    private static String findMessage(Result result, ToolComponent driver, Optional<ReportingDescriptor> rule) throws SarifFormatException {
+        return result.message().getOptionalText().orElseGet(() -> lookupMessageById(result, driver, rule));
+    }
+
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    private static String lookupMessageById(Result result, ToolComponent driver, Optional<ReportingDescriptor> rule) throws SarifFormatException {
+        String messageId = result.message().getOptionalId().orElseThrow(() -> new SarifFormatException("Either text or id must be present"));
+
+        var ruleMessageString = rule.flatMap(ReportingDescriptor::getOptionalMessageStrings).map(MessageStrings::additionalProperties).map(strings -> strings.get(messageId));
+        var globalMessageString = driver.getOptionalGlobalMessageStrings().map(GlobalMessageStrings::additionalProperties).map(strings -> strings.get(messageId));
+
+        var messageString = ruleMessageString.or(() -> globalMessageString).orElseThrow(() -> new SarifFormatException("Message lookup failed"));
+        return messageString.text();
+    }
+
+    private static Optional<ReportingDescriptor> lookupRuleById(String ruleId, Map<String, ReportingDescriptor> ruleOfId) {
+        return Optional.ofNullable(ruleOfId.get(ruleId)).or(() -> getBaseRuleId(ruleId).map(ruleOfId::get));
+    }
+
+    private static Optional<String> getBaseRuleId(String ruleId) {
+        int hierarchySeperatorIndex = ruleId.lastIndexOf('/');
+        if (hierarchySeperatorIndex == -1) {
+            return Optional.empty();
+        }
+        String baseRuleId = ruleId.substring(0, hierarchySeperatorIndex);
+        return Optional.of(baseRuleId);
+    }
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java
deleted file mode 100644
index 3b38d2597a4f..000000000000
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils;
-
-import java.util.List;
-
-import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool;
-import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue;
-import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO;
-
-public final class ReportUtils {
-
-    private ReportUtils() {
-    }
-
-    /**
-     * Creates a report which states that the specified file is too large
-     * to be parsed by the parser.
-     *
-     * @param filename name of the parsed file
-     * @return report with the issue about the filesize
-     */
-    public static StaticCodeAnalysisReportDTO createFileTooLargeReport(String filename) {
-        StaticCodeAnalysisTool tool = StaticCodeAnalysisTool.getToolByFilePattern(filename).orElse(null);
-        List<StaticCodeAnalysisIssue> issues = List.of(new StaticCodeAnalysisIssue(filename, 1, 1, 0, 0, // Assuming there are no column details
-                "TooManyIssues", "miscellaneous", String.format("There are too many issues found in the %s tool.", tool), null, // No priority for this issue
-                null  // No penalty for this issue
-        ));
-
-        return new StaticCodeAnalysisReportDTO(tool, issues);
-    }
-
-    /**
-     * Creates a report wrapping an exception; Used to inform the client about any exception during parsing
-     *
-     * @param filename  name of the parsed file
-     * @param exception exception to wrap
-     * @return a report for the file with an issue wrapping the exception
-     */
-    public static StaticCodeAnalysisReportDTO createErrorReport(String filename, Exception exception) {
-        StaticCodeAnalysisTool tool = StaticCodeAnalysisTool.getToolByFilePattern(filename).orElse(null);
-        List<StaticCodeAnalysisIssue> issues = List.of(new StaticCodeAnalysisIssue(filename, 1, 1, 0, 0, // Assuming there are no column details
-                "ExceptionDuringParsing", "miscellaneous",
-                String.format("An exception occurred during parsing the report for %s. Exception: %s", tool != null ? tool : "file " + filename, exception),
-                // No priority and no penalty for this issue
-                null, null));
-
-        return new StaticCodeAnalysisReportDTO(tool, issues);
-    }
-}
diff --git a/src/main/resources/config/liquibase/changelog/20241101121000_changelog.xml b/src/main/resources/config/liquibase/changelog/20241101121000_changelog.xml
new file mode 100644
index 000000000000..b8e12b77c118
--- /dev/null
+++ b/src/main/resources/config/liquibase/changelog/20241101121000_changelog.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet id="20241101121000" author="rangger">
+        <createTable tableName="saved_post">
+            <column name="id" type="bigint" autoIncrement="true">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="user_id" type="bigint">
+                <constraints nullable="false"/>
+            </column>
+            <column name="post_id" type="bigint">
+                <constraints nullable="false"/>
+            </column>
+            <column name="post_type" type="tinyint">
+                <constraints nullable="false"/>
+            </column>
+            <column name="status" type="tinyint">
+                <constraints nullable="false"/>
+            </column>
+            <column name="completed_at" type="datetime">
+                <constraints nullable="true"/>
+            </column>
+        </createTable>
+
+        <addForeignKeyConstraint baseTableName="saved_post"
+                                 baseColumnNames="user_id"
+                                 constraintName="FK_SAVED_POST_USER"
+                                 referencedTableName="jhi_user"
+                                 referencedColumnNames="id"/>
+
+        <createIndex indexName="IDX_SAVED_POST_USER_ID_POST_ID_POST_TYPE" tableName="saved_post">
+            <column name="user_id"/>
+            <column name="post_id"/>
+            <column name="post_type"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml
index 6a06b398b783..e29f09657055 100644
--- a/src/main/resources/config/liquibase/master.xml
+++ b/src/main/resources/config/liquibase/master.xml
@@ -33,6 +33,7 @@
     <include file="classpath:config/liquibase/changelog/20241010101010_changelog.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/changelog/20241018053210_changelog.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/changelog/20241023456789_changelog.xml" relativeToChangelogFile="false"/>
+    <include file="classpath:config/liquibase/changelog/20241101121000_changelog.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/changelog/20241112123600_changelog.xml" relativeToChangelogFile="false"/>
 
     <!-- NOTE: please use the format "YYYYMMDDhhmmss_changelog.xml", i.e. year month day hour minutes seconds and not something else! -->
diff --git a/src/main/resources/templates/jenkins/c_plus_plus/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/c_plus_plus/regularRuns/pipeline.groovy
index d9bc3bbf4a27..3b0ad271b3ae 100644
--- a/src/main/resources/templates/jenkins/c_plus_plus/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/c_plus_plus/regularRuns/pipeline.groovy
@@ -69,7 +69,6 @@ void postBuildTasks() {
         sed -i 's/[^[:print:]\t]/�/g' test-reports/tests-results.xml
         sed -i 's/<skipped/<error/g' test-reports/tests-results.xml
         sed -i 's/<\\/skipped>/<\\/error>/g' test-reports/tests-results.xml
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' test-reports/tests-results.xml
     fi
     rm -rf results
     mv test-reports results
diff --git a/src/main/resources/templates/jenkins/c_sharp/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/c_sharp/regularRuns/pipeline.groovy
index b8a48c3a6393..871d3db4aaa0 100644
--- a/src/main/resources/templates/jenkins/c_sharp/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/c_sharp/regularRuns/pipeline.groovy
@@ -45,10 +45,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e tests/TestResults/TestResults.xml ]
-    then
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' tests/TestResults/TestResults.xml
-    fi
     cp tests/TestResults/TestResults.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/resources/templates/jenkins/haskell/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/haskell/regularRuns/pipeline.groovy
index eacc732bd58d..9b93985e9622 100644
--- a/src/main/resources/templates/jenkins/haskell/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/haskell/regularRuns/pipeline.groovy
@@ -48,10 +48,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e test-reports/results.xml ]
-    then
-        sed -i 's/<testsuites[^>]*>//g ; s/<\\/testsuites>//g' test-reports/results.xml
-    fi
     cp test-reports/*.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/resources/templates/jenkins/javascript/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/javascript/regularRuns/pipeline.groovy
index bc37c762097a..f65df123e726 100644
--- a/src/main/resources/templates/jenkins/javascript/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/javascript/regularRuns/pipeline.groovy
@@ -45,10 +45,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e junit.xml ]
-    then
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' junit.xml
-    fi
     cp junit.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/resources/templates/jenkins/python/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/python/regularRuns/pipeline.groovy
index 594497262ce2..ead76945175e 100644
--- a/src/main/resources/templates/jenkins/python/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/python/regularRuns/pipeline.groovy
@@ -50,10 +50,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e test-reports/results.xml ]
-    then
-        sed -i 's/<testsuites>//g ; s/<\\/testsuites>//g' test-reports/results.xml
-    fi
     cp test-reports/*.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy
index 9a2ec97b5843..7c1441f0cabe 100644
--- a/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/r/regularRuns/pipeline.groovy
@@ -45,10 +45,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e tests/testthat/junit.xml ]
-    then
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' tests/testthat/junit.xml
-    fi
     cp tests/testthat/junit.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy
index 965d7423ce7c..58d6d570d6d2 100644
--- a/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy
@@ -42,10 +42,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e target/nextest/ci/junit.xml ]
-    then
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' target/nextest/ci/junit.xml
-    fi
     cp target/nextest/ci/junit.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/resources/templates/jenkins/swift/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/swift/regularRuns/pipeline.groovy
index e204451deb56..b2c775762be7 100644
--- a/src/main/resources/templates/jenkins/swift/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/swift/regularRuns/pipeline.groovy
@@ -81,7 +81,6 @@ void postBuildTasks() {
     mkdir results
     if [ -e assignment/tests.xml ]
     then
-        sed -i 's/<testsuites>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' assignment/tests.xml
         cp assignment/tests.xml $WORKSPACE/results/ || true
         sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     fi
diff --git a/src/main/resources/templates/jenkins/typescript/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/typescript/regularRuns/pipeline.groovy
index 1ba259ab3553..f25114413156 100644
--- a/src/main/resources/templates/jenkins/typescript/regularRuns/pipeline.groovy
+++ b/src/main/resources/templates/jenkins/typescript/regularRuns/pipeline.groovy
@@ -48,10 +48,6 @@ void postBuildTasks() {
     sh '''
     rm -rf results
     mkdir results
-    if [ -e junit.xml ]
-    then
-        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' junit.xml
-    fi
     cp junit.xml $WORKSPACE/results/ || true
     sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
     '''
diff --git a/src/main/webapp/app/core/user/account.model.ts b/src/main/webapp/app/core/user/account.model.ts
index ad1d36a2a18b..37f98ded0405 100644
--- a/src/main/webapp/app/core/user/account.model.ts
+++ b/src/main/webapp/app/core/user/account.model.ts
@@ -11,7 +11,7 @@ export class Account {
     public lastName?: string;
     public langKey?: string;
     public imageUrl?: string;
-    public guidedTourSettings: GuidedTourSetting[];
+    public guidedTourSettings?: GuidedTourSetting[];
 
     constructor(
         activated?: boolean,
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
index 6d95da823bb4..3e5157787dbc 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
@@ -222,6 +222,7 @@ <h4 jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.title"></h4>
                                         <ng-container class="col-lg-3 col-md-6 col-sm-6">
                                             <jhi-second-correction-enable-button
                                                 class="me-1 mb-1"
+                                                data-testid="toggle-second-correction"
                                                 (ngModelChange)="toggleSecondCorrection(exercise.id!)"
                                                 [secondCorrectionEnabled]="exercise.secondCorrectionEnabled"
                                                 [togglingSecondCorrectionButton]="isTogglingSecondCorrection.get(exercise.id!)!"
diff --git a/src/main/webapp/app/entities/metis/conversation/conversation.model.ts b/src/main/webapp/app/entities/metis/conversation/conversation.model.ts
index ddb146f12d1f..841a8a5f53de 100644
--- a/src/main/webapp/app/entities/metis/conversation/conversation.model.ts
+++ b/src/main/webapp/app/entities/metis/conversation/conversation.model.ts
@@ -23,6 +23,7 @@ export abstract class Conversation implements BaseEntity {
     public creator?: User;
     public creationDate?: dayjs.Dayjs;
     public lastMessageDate?: dayjs.Dayjs;
+    public title?: string;
 
     protected constructor(type: ConversationType) {
         this.type = type;
diff --git a/src/main/webapp/app/entities/metis/post.model.ts b/src/main/webapp/app/entities/metis/post.model.ts
index 60adfe3c64c0..39950a74af0b 100644
--- a/src/main/webapp/app/entities/metis/post.model.ts
+++ b/src/main/webapp/app/entities/metis/post.model.ts
@@ -2,7 +2,6 @@ import { AnswerPost } from 'app/entities/metis/answer-post.model';
 import { Posting } from 'app/entities/metis/posting.model';
 import { DisplayPriority } from 'app/shared/metis/metis.util';
 import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase';
-import { Conversation } from 'app/entities/metis/conversation/conversation.model';
 
 export class Post extends Posting {
     public title?: string;
@@ -10,7 +9,6 @@ export class Post extends Posting {
     public answers?: AnswerPost[];
     public tags?: string[];
     public plagiarismCase?: PlagiarismCase;
-    public conversation?: Conversation;
     public displayPriority?: DisplayPriority;
     public resolved?: boolean;
     public isConsecutive?: boolean = false;
diff --git a/src/main/webapp/app/entities/metis/posting.model.ts b/src/main/webapp/app/entities/metis/posting.model.ts
index fc7d5d206095..dff35c800654 100644
--- a/src/main/webapp/app/entities/metis/posting.model.ts
+++ b/src/main/webapp/app/entities/metis/posting.model.ts
@@ -3,13 +3,58 @@ import { User } from 'app/core/user/user.model';
 import dayjs from 'dayjs/esm';
 import { Reaction } from 'app/entities/metis/reaction.model';
 import { UserRole } from 'app/shared/metis/metis.util';
+import { Conversation } from 'app/entities/metis/conversation/conversation.model';
+
+export enum SavedPostStatus {
+    PROGRESS = 0,
+    COMPLETED = 1,
+    ARCHIVED = 2,
+}
+
+export enum SavedPostStatusMap {
+    PROGRESS = 'progress',
+    COMPLETED = 'completed',
+    ARCHIVED = 'archived',
+}
+
+export enum PostingType {
+    POST = 0,
+    ANSWER = 1,
+}
 
 export abstract class Posting implements BaseEntity {
     public id?: number;
+    public referencePostId?: number;
     public author?: User;
     public authorRole?: UserRole;
     public creationDate?: dayjs.Dayjs;
     public updatedDate?: dayjs.Dayjs;
     public content?: string;
+    public isSaved?: boolean;
+    public savedPostStatus?: number;
+    public postingType?: number;
     public reactions?: Reaction[];
+    public conversation?: Conversation;
+
+    public static mapToStatus(map: SavedPostStatusMap) {
+        switch (map) {
+            case SavedPostStatusMap.COMPLETED:
+                return SavedPostStatus.COMPLETED;
+            case SavedPostStatusMap.ARCHIVED:
+                return SavedPostStatus.ARCHIVED;
+            default:
+                return SavedPostStatus.PROGRESS;
+        }
+    }
+
+    public static statusToMap(status: SavedPostStatus) {
+        switch (status) {
+            case SavedPostStatus.COMPLETED:
+                return SavedPostStatusMap.COMPLETED;
+            case SavedPostStatus.ARCHIVED:
+                return SavedPostStatusMap.ARCHIVED;
+            default:
+                return SavedPostStatusMap.PROGRESS;
+        }
+    }
 }
diff --git a/src/main/webapp/app/entities/participation/participation.model.ts b/src/main/webapp/app/entities/participation/participation.model.ts
index 0dfd62e9865c..540aab6900cb 100644
--- a/src/main/webapp/app/entities/participation/participation.model.ts
+++ b/src/main/webapp/app/entities/participation/participation.model.ts
@@ -39,6 +39,9 @@ export abstract class Participation implements BaseEntity {
     public initializationDate?: dayjs.Dayjs;
     public individualDueDate?: dayjs.Dayjs;
     public presentationScore?: number;
+    /**
+     * @deprecated This property will be removed in Artemis 8.0. Use `submissions.results` instead.
+     */
     public results?: Result[];
     public submissions?: Submission[];
     public exercise?: Exercise;
diff --git a/src/main/webapp/app/entities/result.model.ts b/src/main/webapp/app/entities/result.model.ts
index 47fff80fda31..cea278d8cb53 100644
--- a/src/main/webapp/app/entities/result.model.ts
+++ b/src/main/webapp/app/entities/result.model.ts
@@ -30,6 +30,9 @@ export class Result implements BaseEntity {
     public submission?: Submission;
     public assessor?: User;
     public feedbacks?: Feedback[];
+    /**
+     * @deprecated This property will be removed in Artemis 8.0. Use `submission.participation` instead.
+     */
     public participation?: Participation;
 
     // helper attributes
diff --git a/src/main/webapp/app/exam/manage/exam-management.route.ts b/src/main/webapp/app/exam/manage/exam-management.route.ts
index c6933eb74d2f..16f0a8e2a5ca 100644
--- a/src/main/webapp/app/exam/manage/exam-management.route.ts
+++ b/src/main/webapp/app/exam/manage/exam-management.route.ts
@@ -65,6 +65,7 @@ import { RepositoryViewComponent } from 'app/localvc/repository-view/repository-
 import { LocalVCGuard } from 'app/localvc/localvc-guard.service';
 import { CommitHistoryComponent } from 'app/localvc/commit-history/commit-history.component';
 import { CommitDetailsViewComponent } from 'app/localvc/commit-details-view/commit-details-view.component';
+import { VcsRepositoryAccessLogViewComponent } from 'app/localvc/vcs-repository-access-log-view/vcs-repository-access-log-view.component';
 
 export const examManagementRoute: Routes = [
     {
@@ -309,9 +310,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.TA, Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -321,9 +319,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.TA, Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.repository.commitHistory.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -333,9 +328,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.TA, Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.repository.commitHistory.commitDetails.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -646,9 +638,24 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
+        },
+        canActivate: [UserRouteAccessService, LocalVCGuard],
+    },
+    {
+        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/vcs-access-log',
+        component: VcsRepositoryAccessLogViewComponent,
+        data: {
+            authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
+            pageTitle: 'artemisApp.repository.title',
+        },
+        canActivate: [UserRouteAccessService, LocalVCGuard],
+    },
+    {
+        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/repository/:repositoryType/repo/:repositoryId',
+        component: RepositoryViewComponent,
+        data: {
+            authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
+            pageTitle: 'artemisApp.repository.title',
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -658,9 +665,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -670,9 +674,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -682,9 +683,15 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
+        },
+        canActivate: [UserRouteAccessService, LocalVCGuard],
+    },
+    {
+        path: ':examId/exercise-groups/:exerciseGroupId/programming-exercises/:exerciseId/participations/:participationId/repository/vcs-access-log',
+        component: VcsRepositoryAccessLogViewComponent,
+        data: {
+            authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
+            pageTitle: 'artemisApp.repository.title',
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -694,9 +701,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -706,9 +710,6 @@ export const examManagementRoute: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
diff --git a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-management-routing.module.ts b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-management-routing.module.ts
index 0307f567a816..f2b7ac2605a5 100644
--- a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-management-routing.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-management-routing.module.ts
@@ -12,9 +12,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.editor.home.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService],
     },
@@ -24,9 +21,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.editor.home.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService],
     },
@@ -36,9 +30,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.editor.home.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService],
     },
@@ -48,9 +39,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.editor.home.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService],
     },
@@ -60,9 +48,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.EDITOR, Authority.INSTRUCTOR, Authority.ADMIN],
             pageTitle: 'artemisApp.editor.home.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService],
     },
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts
index 583c85ec8b49..19c51d8dff55 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts
@@ -166,9 +166,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -178,9 +175,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -190,9 +184,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [LocalVCGuard],
     },
@@ -202,9 +193,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [LocalVCGuard],
     },
@@ -214,9 +202,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [LocalVCGuard],
     },
@@ -226,9 +211,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [LocalVCGuard],
     },
@@ -238,9 +220,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [LocalVCGuard],
     },
@@ -250,9 +229,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -262,9 +238,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -274,9 +247,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -286,9 +256,6 @@ export const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
diff --git a/src/main/webapp/app/exercises/programming/participate/programming-participation-routing.module.ts b/src/main/webapp/app/exercises/programming/participate/programming-participation-routing.module.ts
index e5ddddb415ab..55f0d5bd5a17 100644
--- a/src/main/webapp/app/exercises/programming/participate/programming-participation-routing.module.ts
+++ b/src/main/webapp/app/exercises/programming/participate/programming-participation-routing.module.ts
@@ -11,9 +11,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.USER],
             pageTitle: 'artemisApp.editor.home.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService],
     },
diff --git a/src/main/webapp/app/exercises/programming/participate/programming-repository-routing.module.ts b/src/main/webapp/app/exercises/programming/participate/programming-repository-routing.module.ts
index 76697a6cd7d9..155f8ac14580 100644
--- a/src/main/webapp/app/exercises/programming/participate/programming-repository-routing.module.ts
+++ b/src/main/webapp/app/exercises/programming/participate/programming-repository-routing.module.ts
@@ -13,9 +13,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.USER],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -25,9 +22,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.USER],
             pageTitle: 'artemisApp.repository.commitHistory.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -37,9 +31,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.USER],
             pageTitle: 'artemisApp.repository.commitHistory.commitDetails.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
@@ -49,9 +40,6 @@ const routes: Routes = [
         data: {
             authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.TA],
             pageTitle: 'artemisApp.repository.title',
-            flushRepositoryCacheAfter: 900000, // 15 min
-            participationCache: {},
-            repositoryCache: {},
         },
         canActivate: [UserRouteAccessService, LocalVCGuard],
     },
diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html
index 14c1ad054fb1..2ac0bbee41af 100644
--- a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html
+++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html
@@ -38,6 +38,7 @@
                     @if (exercise.isAtLeastInstructor && exam?.numberOfCorrectionRoundsInExam && exam?.numberOfCorrectionRoundsInExam! > 1 && isExamMode && !isTestRun) {
                         <div class="d-inline-block">
                             <jhi-second-correction-enable-button
+                                data-testid="toggle-second-correction"
                                 (ngModelChange)="toggleSecondCorrection()"
                                 [secondCorrectionEnabled]="secondCorrectionEnabled"
                                 [togglingSecondCorrectionButton]="togglingSecondCorrectionButton"
diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts
index 547009a136bd..8ec76214ddee 100644
--- a/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts
@@ -17,6 +17,7 @@ import { ComplaintService } from 'app/complaints/complaint.service';
 import { isDateLessThanAWeekInTheFuture } from 'app/utils/date.utils';
 import { DifficultyLevelComponent } from 'app/shared/difficulty-level/difficulty-level.component';
 import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
+import { ArtemisServerDateService } from 'app/shared/server-date.service';
 
 @Component({
     selector: 'jhi-exercise-headers-information',
@@ -41,15 +42,19 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
     dueDate?: dayjs.Dayjs;
     programmingExercise?: ProgrammingExercise;
     individualComplaintDueDate?: dayjs.Dayjs;
+    now: dayjs.Dayjs;
     achievedPoints: number = 0;
     numberOfSubmissions: number;
     informationBoxItems: InformationBox[] = [];
 
-    constructor(private sortService: SortService) {}
+    constructor(
+        private sortService: SortService,
+        private serverDateService: ArtemisServerDateService,
+    ) {}
 
     ngOnInit() {
         this.dueDate = getExerciseDueDate(this.exercise, this.studentParticipation);
-
+        this.now = this.serverDateService.now();
         if (this.course?.maxComplaintTimeDays) {
             this.individualComplaintDueDate = ComplaintService.getIndividualComplaintDueDate(
                 this.exercise,
@@ -107,14 +112,12 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
     }
 
     addDueDateItems() {
-        const now = dayjs();
-
         const dueDateItem = this.getDueDateItem();
         if (dueDateItem) {
             this.informationBoxItems.push(dueDateItem);
         }
         // If the due date is in the past and the assessment due date is in the future, show the assessment due date
-        if (this.dueDate?.isBefore(now) && this.exercise.assessmentDueDate?.isAfter(now)) {
+        if (this.dueDate?.isBefore(this.now) && this.exercise.assessmentDueDate?.isAfter(this.now)) {
             const assessmentDueItem: InformationBox = {
                 title: 'artemisApp.courseOverview.exerciseDetails.assessmentDue',
                 content: {
@@ -123,11 +126,12 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
                 },
                 isContentComponent: true,
                 tooltip: 'artemisApp.courseOverview.exerciseDetails.assessmentDueTooltip',
+                tooltipParams: { date: this.exercise.assessmentDueDate.format('lll') },
             };
             this.informationBoxItems.push(assessmentDueItem);
         }
         // // If the assessment due date is in the past and the complaint due date is in the future, show the complaint due date
-        if (this.exercise.assessmentDueDate?.isBefore(now) && this.individualComplaintDueDate?.isAfter(now)) {
+        if (this.exercise.assessmentDueDate?.isBefore(this.now) && this.individualComplaintDueDate?.isAfter(this.now)) {
             const complaintDueItem: InformationBox = {
                 title: 'artemisApp.courseOverview.exerciseDetails.complaintDue',
                 content: {
@@ -136,6 +140,7 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
                 },
                 isContentComponent: true,
                 tooltip: 'artemisApp.courseOverview.exerciseDetails.complaintDueTooltip',
+                tooltipParams: { date: this.individualComplaintDueDate.format('lll') },
             };
             this.informationBoxItems.push(complaintDueItem);
         }
@@ -143,11 +148,11 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
 
     getDueDateItem(): InformationBox | undefined {
         if (this.dueDate) {
-            const isDueDateInThePast = this.dueDate.isBefore(dayjs());
+            const isDueDateInThePast = this.dueDate.isBefore(this.now);
             // If the due date is less than a day away, the color change to red
-            const dueDateStatusBadge = this.dueDate.isBetween(dayjs().add(1, 'day'), dayjs()) ? 'danger' : 'body-color';
+            const dueDateStatusBadge = this.dueDate.isBetween(this.now.add(1, 'day'), this.now) ? 'danger' : 'body-color';
             // If the due date is less than a week away, text is displayed relatively e.g. 'in 2 days'
-            const shouldDisplayDueDateRelative = isDateLessThanAWeekInTheFuture(this.dueDate);
+            const shouldDisplayDueDateRelative = isDateLessThanAWeekInTheFuture(this.dueDate, this.now);
 
             if (isDueDateInThePast) {
                 return {
@@ -175,9 +180,9 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
     }
 
     addStartDateItem() {
-        if (this.exercise.startDate && dayjs().isBefore(this.exercise.startDate)) {
+        if (this.exercise.startDate && this.now.isBefore(this.exercise.startDate)) {
             // If the start date is less than a week away, text is displayed relatively e.g. 'in 2 days'
-            const shouldDisplayStartDateRelative = isDateLessThanAWeekInTheFuture(this.exercise.startDate);
+            const shouldDisplayStartDateRelative = isDateLessThanAWeekInTheFuture(this.exercise.startDate, this.now);
             const startDateItem: InformationBox = {
                 title: 'artemisApp.courseOverview.exerciseDetails.startDate',
                 content: {
@@ -218,7 +223,7 @@ export class ExerciseHeadersInformationComponent implements OnInit, OnChanges {
     }
 
     addCategoryItems() {
-        const notReleased = this.exercise.releaseDate && dayjs(this.exercise.releaseDate).isAfter(dayjs());
+        const notReleased = this.exercise.releaseDate?.isAfter(this.now);
 
         if (notReleased || this.exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY || this.exercise.categories?.length) {
             const categoryItem: InformationBox = {
diff --git a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.html b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.html
index 7021b3f79c4d..9f75be4268e7 100644
--- a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.html
+++ b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.html
@@ -1,11 +1,24 @@
 <div style="padding-bottom: 60px">
-    <h3 id="build-agents-heading" jhiTranslate="artemisApp.buildAgents.summary"></h3>
     @if (buildAgents) {
-        <p>
-            {{ buildAgents.length }} <span jhiTranslate="artemisApp.buildAgents.onlineAgents"></span>: {{ currentBuilds }} <span jhiTranslate="artemisApp.buildAgents.of"></span>
-            {{ buildCapacity }} <span jhiTranslate="artemisApp.buildAgents.buildJobsRunning"></span>
-        </p>
-        <div class="d-flex justify-content-between align-items-center border-bottom pb-2 mb-3"></div>
+        <div class="d-flex justify-content-between align-items-center border-bottom pb-2 mb-3">
+            <div>
+                <h3 id="build-agents-heading" jhiTranslate="artemisApp.buildAgents.summary"></h3>
+                <p>
+                    {{ buildAgents.length }} <span jhiTranslate="artemisApp.buildAgents.onlineAgents"></span>: {{ currentBuilds }}
+                    <span jhiTranslate="artemisApp.buildAgents.of"></span> {{ buildCapacity }} <span jhiTranslate="artemisApp.buildAgents.buildJobsRunning"></span>
+                </p>
+            </div>
+            <div>
+                <button class="btn btn-success" (click)="resumeAllBuildAgents()">
+                    <fa-icon [icon]="faPlay" />
+                    <span jhiTranslate="artemisApp.buildAgents.resumeAll"></span>
+                </button>
+                <button class="btn btn-danger" (click)="displayPauseBuildAgentModal(content)">
+                    <fa-icon [icon]="faPause" />
+                    <span jhiTranslate="artemisApp.buildAgents.pauseAll"></span>
+                </button>
+            </div>
+        </div>
         <jhi-data-table [showPageSizeDropdown]="false" [showSearchField]="false" entityType="buildAgent" [allEntities]="buildAgents!">
             <ng-template let-settings="settings" let-controls="controls">
                 <ngx-datatable
@@ -115,3 +128,28 @@ <h3 id="build-agents-heading" jhiTranslate="artemisApp.buildAgents.summary"></h3
         </jhi-data-table>
     }
 </div>
+
+<!-- Modal -->
+<ng-template #content let-modal>
+    <div class="modal-header">
+        <h5 class="modal-title">
+            <span jhiTranslate="artemisApp.buildAgents.pauseAll"></span>
+        </h5>
+        <button type="button" class="btn-close" aria-label="Close" (click)="modal.close()"></button>
+    </div>
+    <div class="modal-body">
+        <div>
+            <span jhiTranslate="artemisApp.buildAgents.pauseAllWarning"></span>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" (click)="modal.close()">
+            <fa-icon [icon]="faTimes" />
+            <span jhiTranslate="artemisApp.buildQueue.filter.close"></span>
+        </button>
+        <button type="button" class="btn btn-danger" (click)="pauseAllBuildAgents(modal)">
+            <fa-icon [icon]="faPause" />
+            <span jhiTranslate="artemisApp.buildAgents.pauseAll"></span>
+        </button>
+    </div>
+</ng-template>
diff --git a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts
index 711fa4a40dce..5e79ceac3c75 100644
--- a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts
+++ b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts
@@ -1,12 +1,14 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { BuildAgentInformation } from 'app/entities/programming/build-agent-information.model';
+import { BuildAgentInformation, BuildAgentStatus } from 'app/entities/programming/build-agent-information.model';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
 import { Subscription } from 'rxjs';
-import { faTimes } from '@fortawesome/free-solid-svg-icons';
+import { faPause, faPlay, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { BuildQueueService } from 'app/localci/build-queue/build-queue.service';
 import { Router } from '@angular/router';
 import { BuildAgent } from 'app/entities/programming/build-agent.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AlertService, AlertType } from 'app/core/util/alert.service';
 
 @Component({
     selector: 'jhi-build-agents',
@@ -23,13 +25,17 @@ export class BuildAgentSummaryComponent implements OnInit, OnDestroy {
     routerLink: string;
 
     //icons
-    faTimes = faTimes;
+    protected readonly faTimes = faTimes;
+    protected readonly faPause = faPause;
+    protected readonly faPlay = faPlay;
 
     constructor(
         private websocketService: JhiWebsocketService,
         private buildAgentsService: BuildAgentsService,
         private buildQueueService: BuildQueueService,
         private router: Router,
+        private modalService: NgbModal,
+        private alertService: AlertService,
     ) {}
 
     ngOnInit() {
@@ -59,7 +65,9 @@ export class BuildAgentSummaryComponent implements OnInit, OnDestroy {
 
     private updateBuildAgents(buildAgents: BuildAgentInformation[]) {
         this.buildAgents = buildAgents;
-        this.buildCapacity = this.buildAgents.reduce((sum, agent) => sum + (agent.maxNumberOfConcurrentBuildJobs || 0), 0);
+        this.buildCapacity = this.buildAgents
+            .filter((agent) => agent.status !== BuildAgentStatus.PAUSED)
+            .reduce((sum, agent) => sum + (agent.maxNumberOfConcurrentBuildJobs || 0), 0);
         this.currentBuilds = this.buildAgents.reduce((sum, agent) => sum + (agent.numberOfCurrentBuildJobs || 0), 0);
     }
 
@@ -86,4 +94,47 @@ export class BuildAgentSummaryComponent implements OnInit, OnDestroy {
             this.buildQueueService.cancelAllRunningBuildJobsForAgent(buildAgentToCancel.buildAgent?.name).subscribe();
         }
     }
+
+    displayPauseBuildAgentModal(modal: any) {
+        this.modalService.open(modal);
+    }
+
+    pauseAllBuildAgents(modal?: any) {
+        this.buildAgentsService.pauseAllBuildAgents().subscribe({
+            next: () => {
+                this.load();
+                this.alertService.addAlert({
+                    type: AlertType.SUCCESS,
+                    message: 'artemisApp.buildAgents.alerts.buildAgentsPaused',
+                });
+            },
+            error: () => {
+                this.alertService.addAlert({
+                    type: AlertType.DANGER,
+                    message: 'artemisApp.buildAgents.alerts.buildAgentPauseFailed',
+                });
+            },
+        });
+        if (modal) {
+            modal.close();
+        }
+    }
+
+    resumeAllBuildAgents() {
+        this.buildAgentsService.resumeAllBuildAgents().subscribe({
+            next: () => {
+                this.load();
+                this.alertService.addAlert({
+                    type: AlertType.SUCCESS,
+                    message: 'artemisApp.buildAgents.alerts.buildAgentsResumed',
+                });
+            },
+            error: () => {
+                this.alertService.addAlert({
+                    type: AlertType.DANGER,
+                    message: 'artemisApp.buildAgents.alerts.buildAgentResumeFailed',
+                });
+            },
+        });
+    }
 }
diff --git a/src/main/webapp/app/localci/build-agents/build-agents.service.ts b/src/main/webapp/app/localci/build-agents/build-agents.service.ts
index 6aac582940d3..c3b388586bcf 100644
--- a/src/main/webapp/app/localci/build-agents/build-agents.service.ts
+++ b/src/main/webapp/app/localci/build-agents/build-agents.service.ts
@@ -33,22 +33,44 @@ export class BuildAgentsService {
      */
     pauseBuildAgent(agentName: string): Observable<void> {
         const encodedAgentName = encodeURIComponent(agentName);
-        return this.http.put<void>(`${this.adminResourceUrl}/agent/${encodedAgentName}/pause`, null).pipe(
+        return this.http.put<void>(`${this.adminResourceUrl}/agents/${encodedAgentName}/pause`, null).pipe(
             catchError((err) => {
                 return throwError(() => new Error(`Failed to pause build agent ${agentName}\n${err.message}`));
             }),
         );
     }
 
+    /**
+     * Pause All Build Agents
+     */
+    pauseAllBuildAgents(): Observable<void> {
+        return this.http.put<void>(`${this.adminResourceUrl}/agents/pause-all`, null).pipe(
+            catchError((err) => {
+                return throwError(() => new Error(`Failed to pause build agents\n${err.message}`));
+            }),
+        );
+    }
+
     /**
      * Resume Build Agent
      */
     resumeBuildAgent(agentName: string): Observable<void> {
         const encodedAgentName = encodeURIComponent(agentName);
-        return this.http.put<void>(`${this.adminResourceUrl}/agent/${encodedAgentName}/resume`, null).pipe(
+        return this.http.put<void>(`${this.adminResourceUrl}/agents/${encodedAgentName}/resume`, null).pipe(
             catchError((err) => {
                 return throwError(() => new Error(`Failed to resume build agent ${agentName}\n${err.message}`));
             }),
         );
     }
+
+    /**
+     * Resume all Build Agents
+     */
+    resumeAllBuildAgents(): Observable<void> {
+        return this.http.put<void>(`${this.adminResourceUrl}/agents/resume-all`, null).pipe(
+            catchError((err) => {
+                return throwError(() => new Error(`Failed to resume build agents\n${err.message}`));
+            }),
+        );
+    }
 }
diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html
index 1e7b44fa6fb7..6b2bac7d8ada 100644
--- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html
+++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html
@@ -38,7 +38,7 @@
                     [sidebarItemAlwaysShow]="DEFAULT_SHOW_ALWAYS"
                     [collapseState]="DEFAULT_COLLAPSE_STATE"
                     [inCommunication]="true"
-                    [reEmitNonDistinctSidebarEvents]="isMobile"
+                    [reEmitNonDistinctSidebarEvents]="true"
                 />
             </div>
             @if (course && !activeConversation && isCodeOfConductPresented) {
@@ -57,9 +57,15 @@
                         (openThread)="postInThread = $event"
                         [course]="course"
                         [searchbarCollapsed]="channelSearchCollapsed"
+                        [focusPostId]="focusPostId"
+                        [openThreadOnFocus]="openThreadOnFocus"
                     />
                 } @else {
-                    <jhi-course-wide-search (openThread)="postInThread = $event" [courseWideSearchConfig]="courseWideSearchConfig" />
+                    @if (selectedSavedPostStatus === null) {
+                        <jhi-course-wide-search (openThread)="postInThread = $event" [courseWideSearchConfig]="courseWideSearchConfig" />
+                    } @else {
+                        <jhi-saved-posts [savedPostStatus]="selectedSavedPostStatus" [courseId]="course.id" (onNavigateToPost)="onNavigateToPost($event)"></jhi-saved-posts>
+                    }
                 }
             </div>
             <div class="scrollable-content" [ngClass]="{ 'content-height-dev': !isProduction || isTestServer, 'is-answer-thread-open': !!postInThread }">
diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts b/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts
index 1b194b218bd3..f65878c794e1 100644
--- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts
+++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, HostListener, OnDestroy, OnInit, ViewChild, ViewEncapsulation, inject } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, OnDestroy, OnInit, ViewChild, ViewEncapsulation, inject } from '@angular/core';
 import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
 import { Post } from 'app/entities/metis/post.model';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -10,7 +10,21 @@ import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/
 import { MetisService } from 'app/shared/metis/metis.service';
 import { Course, isMessagingEnabled } from 'app/entities/course.model';
 import { PageType, SortDirection } from 'app/shared/metis/metis.util';
-import { faBan, faComment, faComments, faFile, faFilter, faGraduationCap, faHeart, faList, faMessage, faPlus, faSearch, faTimes } from '@fortawesome/free-solid-svg-icons';
+import {
+    faBan,
+    faBookmark,
+    faComment,
+    faComments,
+    faFile,
+    faFilter,
+    faGraduationCap,
+    faHeart,
+    faList,
+    faMessage,
+    faPlus,
+    faSearch,
+    faTimes,
+} from '@fortawesome/free-solid-svg-icons';
 import { ButtonType } from 'app/shared/components/button.component';
 import { CourseWideSearchComponent, CourseWideSearchConfig } from 'app/overview/course-conversations/course-wide-search/course-wide-search.component';
 import { AccordionGroups, ChannelAccordionShowAdd, ChannelTypeIcons, CollapseState, SidebarCardElement, SidebarData, SidebarItemShowAlways } from 'app/types/sidebar';
@@ -25,6 +39,7 @@ import { ChannelsCreateDialogComponent } from 'app/overview/course-conversations
 import { CourseSidebarService } from 'app/overview/course-sidebar.service';
 import { LayoutService } from 'app/shared/breakpoints/layout.service';
 import { CustomBreakpointNames } from 'app/shared/breakpoints/breakpoints.service';
+import { Posting, PostingType, SavedPostStatus, SavedPostStatusMap } from 'app/entities/metis/posting.model';
 
 const DEFAULT_CHANNEL_GROUPS: AccordionGroups = {
     favoriteChannels: { entityData: [] },
@@ -33,6 +48,7 @@ const DEFAULT_CHANNEL_GROUPS: AccordionGroups = {
     lectureChannels: { entityData: [] },
     examChannels: { entityData: [] },
     hiddenChannels: { entityData: [] },
+    savedPosts: { entityData: [] },
 };
 
 const CHANNEL_TYPE_SHOW_ADD_OPTION: ChannelAccordionShowAdd = {
@@ -44,6 +60,7 @@ const CHANNEL_TYPE_SHOW_ADD_OPTION: ChannelAccordionShowAdd = {
     favoriteChannels: false,
     lectureChannels: true,
     hiddenChannels: false,
+    savedPosts: false,
 };
 
 const CHANNEL_TYPE_ICON: ChannelTypeIcons = {
@@ -55,6 +72,7 @@ const CHANNEL_TYPE_ICON: ChannelTypeIcons = {
     favoriteChannels: faHeart,
     lectureChannels: faFile,
     hiddenChannels: faBan,
+    savedPosts: faBookmark,
 };
 
 const DEFAULT_COLLAPSE_STATE: CollapseState = {
@@ -66,6 +84,7 @@ const DEFAULT_COLLAPSE_STATE: CollapseState = {
     favoriteChannels: false,
     lectureChannels: true,
     hiddenChannels: true,
+    savedPosts: true,
 };
 
 const DEFAULT_SHOW_ALWAYS: SidebarItemShowAlways = {
@@ -77,6 +96,7 @@ const DEFAULT_SHOW_ALWAYS: SidebarItemShowAlways = {
     favoriteChannels: true,
     lectureChannels: false,
     hiddenChannels: false,
+    savedPosts: true,
 };
 
 @Component({
@@ -110,6 +130,9 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
     isProduction = true;
     isTestServer = false;
     isMobile = false;
+    focusPostId: number | undefined = undefined;
+    openThreadOnFocus = false;
+    selectedSavedPostStatus: null | SavedPostStatus = null;
 
     readonly CHANNEL_TYPE_SHOW_ADD_OPTION = CHANNEL_TYPE_SHOW_ADD_OPTION;
     readonly CHANNEL_TYPE_ICON = CHANNEL_TYPE_ICON;
@@ -140,6 +163,7 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
 
     private courseSidebarService: CourseSidebarService = inject(CourseSidebarService);
     private layoutService: LayoutService = inject(LayoutService);
+    private changeDetector: ChangeDetectorRef = inject(ChangeDetectorRef);
 
     constructor(
         private router: Router,
@@ -251,9 +275,23 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
     subscribeToQueryParameter() {
         this.activatedRoute.queryParams.pipe(take(1), takeUntil(this.ngUnsubscribe)).subscribe((queryParams) => {
             if (queryParams.conversationId) {
-                this.metisConversationService.setActiveConversation(Number(queryParams.conversationId));
-
-                this.closeSidebarOnMobile();
+                if (
+                    isNaN(Number(queryParams.conversationId)) &&
+                    Object.values(SavedPostStatusMap)
+                        .map((s) => s.toString())
+                        .includes(queryParams.conversationId)
+                ) {
+                    this.selectedSavedPostStatus = Posting.mapToStatus(queryParams.conversationId as SavedPostStatusMap);
+                } else {
+                    this.metisConversationService.setActiveConversation(Number(queryParams.conversationId));
+                    this.closeSidebarOnMobile();
+                }
+            }
+            if (queryParams.focusPostId) {
+                this.focusPostId = Number(queryParams.focusPostId);
+            }
+            if (queryParams.openThreadOnFocus) {
+                this.openThreadOnFocus = queryParams.openThreadOnFocus;
             }
             if (queryParams.messageId) {
                 this.postInThread = { id: Number(queryParams.messageId) } as Post;
@@ -265,11 +303,22 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
         });
     }
 
+    onNavigateToPost(post: Posting) {
+        if (post.referencePostId === undefined || post.conversation?.id === undefined) {
+            return;
+        }
+
+        this.focusPostId = post.referencePostId;
+        this.openThreadOnFocus = (post.postingType as PostingType) === PostingType.ANSWER;
+        this.metisConversationService.setActiveConversation(post.conversation!.id!);
+        this.changeDetector.detectChanges();
+    }
+
     updateQueryParameters() {
         this.router.navigate([], {
             relativeTo: this.activatedRoute,
             queryParams: {
-                conversationId: this.activeConversation?.id,
+                conversationId: this.activeConversation?.id ?? (this.selectedSavedPostStatus !== null ? Posting.statusToMap(this.selectedSavedPostStatus) : undefined),
             },
             replaceUrl: true,
         });
@@ -348,6 +397,7 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
                 this.courseSidebarService.openSidebar();
             }
         }
+        this.selectedSavedPostStatus = null;
         this.metisConversationService.setActiveConversation(undefined);
         this.activeConversation = undefined;
         this.updateQueryParameters();
@@ -377,9 +427,29 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
         };
     }
 
-    onConversationSelected(conversationId: number) {
+    onConversationSelected(conversationId: number | string) {
         this.closeSidebarOnMobile();
-        this.metisConversationService.setActiveConversation(conversationId);
+        this.focusPostId = undefined;
+        this.openThreadOnFocus = false;
+        if (typeof conversationId === 'string') {
+            if (
+                Object.values(SavedPostStatusMap)
+                    .map((s) => s.toString())
+                    .includes(conversationId)
+            ) {
+                this.selectedSavedPostStatus = Posting.mapToStatus(conversationId as SavedPostStatusMap);
+                this.postInThread = undefined;
+                this.metisConversationService.setActiveConversation(undefined);
+                this.activeConversation = undefined;
+                this.updateQueryParameters();
+                this.metisService.resetCachedPosts();
+                this.changeDetector.detectChanges();
+            }
+        } else {
+            conversationId = +conversationId;
+            this.selectedSavedPostStatus = null;
+            this.metisConversationService.setActiveConversation(conversationId);
+        }
     }
 
     toggleSidebar() {
diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts b/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts
index 0646118f577f..10d2cea22583 100644
--- a/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts
+++ b/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts
@@ -31,6 +31,8 @@ import { CourseConversationsCodeOfConductComponent } from 'app/overview/course-c
 import { CourseWideSearchComponent } from 'app/overview/course-conversations/course-wide-search/course-wide-search.component';
 import { ArtemisSidebarModule } from 'app/shared/sidebar/sidebar.module';
 import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component';
+import { SavedPostsComponent } from 'app/overview/course-conversations/saved-posts/saved-posts.component';
+import { PostingSummaryComponent } from 'app/overview/course-conversations/posting-summary/posting-summary.component';
 
 const routes: Routes = [
     {
@@ -79,6 +81,8 @@ const routes: Routes = [
         OneToOneChatCreateDialogComponent,
         GroupChatCreateDialogComponent,
         CourseWideSearchComponent,
+        SavedPostsComponent,
+        PostingSummaryComponent,
     ],
 })
 export class CourseConversationsModule {}
diff --git a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html
index 1295be3edf63..c9641f8aa287 100644
--- a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html
+++ b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html
@@ -72,7 +72,7 @@ <h4 class="d-inline-block rounded p-1 info">
             </div>
         }
         <hr />
-        <div class="row px-3 justify-content-center coursewide-search">
+        <div class="justify-content-center coursewide-search">
             <div class="justify-content-center">
                 <div class="row">
                     <!-- loading messages -->
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html
index f7f35b3b2a3e..3cc7ff2a571d 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html
@@ -1,5 +1,5 @@
 @if (course) {
-    <div class="row p-3 pt-0 justify-content-center conversation-messages">
+    <div class="py-3 pt-0 justify-content-center conversation-messages">
         <div class="justify-content-center">
             <div class="row justify-content-center p-0">
                 <!-- search bar -->
@@ -103,7 +103,7 @@
                     }
 
                     @if (_activeConversation && newPost && canCreateNewMessageInConversation(_activeConversation) && isMobile) {
-                        <div>
+                        <div class="px-3">
                             @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
                                 <div class="pt-2">
                                     <button class="btn btn-md btn-primary" (click)="createEditModal.open()" jhiTranslate="artemisApp.metis.newAnnouncement"></button>
@@ -116,7 +116,7 @@
                     }
                 </div>
                 @if (_activeConversation && newPost && canCreateNewMessageInConversation(_activeConversation) && !isMobile) {
-                    <div class="d-none d-sm-block">
+                    <div class="d-none d-sm-block px-3">
                         @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
                             <div class="pt-2">
                                 <button class="btn btn-md btn-primary" (click)="createEditModal.open()" jhiTranslate="artemisApp.metis.newAnnouncement"></button>
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts
index 7fdbe98508c2..17342052df52 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts
@@ -13,7 +13,9 @@ import {
     ViewChild,
     ViewChildren,
     ViewEncapsulation,
+    effect,
     inject,
+    input,
 } from '@angular/core';
 import { faCircleNotch, faEnvelope, faSearch, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { Conversation, ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
@@ -73,6 +75,8 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
     searchbarCollapsed = false;
     @Input()
     contentHeightDev: boolean = false;
+    readonly focusPostId = input<number | undefined>(undefined);
+    readonly openThreadOnFocus = input<boolean>(false);
 
     getAsChannel = getAsChannelDTO;
 
@@ -101,6 +105,8 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
     isMobile = false;
     isHiddenInputWithCallToAction = false;
     isHiddenInputFull = false;
+    focusOnPostId: number | undefined = undefined;
+    isOpenThreadOnFocus: boolean = false;
 
     private layoutService: LayoutService = inject(LayoutService);
     private renderer = inject(Renderer2);
@@ -109,7 +115,12 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
         public metisService: MetisService, // instance from course-conversations.component
         public metisConversationService: MetisConversationService, // instance from course-conversations.component
         public cdr: ChangeDetectorRef,
-    ) {}
+    ) {
+        effect(() => {
+            this.focusOnPostId = this.focusPostId();
+            this.isOpenThreadOnFocus = this.openThreadOnFocus();
+        });
+    }
 
     ngOnInit(): void {
         this.subscribeToSearch();
@@ -130,7 +141,7 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
     private subscribeToActiveConversation() {
         this.metisConversationService.activeConversation$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((conversation: ConversationDTO) => {
             // This statement avoids a bug that reloads the messages when the conversation is already displayed
-            if (this._activeConversation?.id === conversation.id) {
+            if (conversation && this._activeConversation?.id === conversation.id) {
                 return;
             }
             this._activeConversation = conversation;
@@ -179,8 +190,13 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
     }
 
     private scrollToStoredId() {
-        const savedScrollId = sessionStorage.getItem(this.sessionStorageKey + this._activeConversation?.id) ?? '';
-        requestAnimationFrame(() => this.goToLastSelectedElement(parseInt(savedScrollId, 10)));
+        let savedScrollId;
+        if (this.focusOnPostId) {
+            savedScrollId = this.focusOnPostId + '';
+        } else {
+            savedScrollId = sessionStorage.getItem(this.sessionStorageKey + this._activeConversation?.id) ?? '';
+        }
+        requestAnimationFrame(() => this.goToLastSelectedElement(parseInt(savedScrollId, 10), this.isOpenThreadOnFocus));
     }
 
     private onActiveConversationChange() {
@@ -389,7 +405,7 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
         this.scrollToBottomOfMessages();
     }
 
-    async goToLastSelectedElement(lastScrollPosition: number) {
+    async goToLastSelectedElement(lastScrollPosition: number, isOpenThread: boolean) {
         if (!lastScrollPosition) {
             this.scrollToBottomOfMessages();
             this.canStartSaving = true;
@@ -404,6 +420,11 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD
             // We scroll to the element with a slight buffer to ensure its fully visible (-10)
             this.content.nativeElement.scrollTop = Math.max(0, element.elementRef.nativeElement.offsetTop - 10);
             this.canStartSaving = true;
+            if (isOpenThread) {
+                this.openThread.emit(element.post);
+            }
+            this.focusOnPostId = undefined;
+            this.isOpenThreadOnFocus = false;
         }
     }
 
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.html
index 64ae4ee9d908..db9e1ebcdb24 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.html
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.html
@@ -25,7 +25,7 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.conversationsLayout.threadSi
             <div #scrollBody class="pt-0 scrollbar wrapper-scroll-y mx-1 thread-answer-post">
                 @if (post !== undefined) {
                     <div class="my-2">
-                        <div class="card-body">
+                        <div class="card-body px-0">
                             <jhi-post
                                 [readOnlyMode]="readOnlyMode"
                                 [posting]="post"
@@ -36,7 +36,7 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.conversationsLayout.threadSi
                                 [hasChannelModerationRights]="hasChannelModerationRights"
                             />
                         </div>
-                        <div class="message-input mx-3">
+                        <div class="message-input mx-3 px-3 pt-2">
                             @if (!readOnlyMode) {
                                 <jhi-message-reply-inline-input
                                     [activeConversation]="conversation"
diff --git a/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.html b/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.html
new file mode 100644
index 000000000000..81bd50621f3d
--- /dev/null
+++ b/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.html
@@ -0,0 +1,93 @@
+<div class="posting-summary rounded p-2" (click)="onTriggerNavigateToPost()">
+    @if (post() !== undefined) {
+        @if (isShowSummary) {
+            <div class="posting-summary-conversation fs-x-small text-secondary d-flex align-items-center mb-1">
+                <span class="d-inline-block">
+                    <fa-icon [icon]="post()!.conversation!.type! == ConversationType.CHANNEL ? faHashtag : faLock"></fa-icon>
+                </span>
+                <span class="d-inline-block ms-1">
+                    {{ post()!.conversation!.title! }}
+                    @if (isAnswerPost) {
+                        > <span jhiTranslate="artemisApp.metis.post.thread"></span>
+                    }
+                </span>
+            </div>
+        }
+        @if (isShowContent) {
+            <div class="posting-summary-wrap">
+                @if (isAnswerPost) {
+                    <div class="text-secondary">
+                        <fa-icon [icon]="faEllipsis"></fa-icon>
+                    </div>
+                }
+                <div class="posting-summary-content d-inline-flex align-items-start gap-2" [ngClass]="{ 'is-answer-post': isAnswerPost }">
+                    <jhi-profile-picture
+                        imageSizeInRem="2.25"
+                        fontSizeInRem="0.9"
+                        imageId="post-profile-picture"
+                        defaultPictureId="post-default-profile-picture"
+                        [authorId]="post()!.author!.id!"
+                        [authorName]="post()!.author!.name!"
+                        [imageUrl]="post()!.author!.imageUrl!"
+                    >
+                    </jhi-profile-picture>
+                    <div class="posting-summary-author-content fs-small flex-column align-items-start">
+                        <div>
+                            <span class="fw-semibold d-inline-block me-1">{{ post()!.author!.name! }}</span>
+                            @if (post()!.creationDate !== undefined) {
+                                <span class="fs-small text-secondary" [disableTooltip]="postingIsOfToday" ngbTooltip="{{ post()!.creationDate! | artemisDate: 'time' }}">
+                                    {{ postingIsOfToday ? (post()!.creationDate! | artemisDate: 'time') : (post()!.creationDate! | artemisDate: 'short-date') }}
+                                </span>
+                            }
+                        </div>
+                        <div>
+                            <jhi-posting-content
+                                [previewMode]="false"
+                                [content]="post()!.content!"
+                                [author]="post()!.author!"
+                                [isEdited]="!!post()!.updatedDate"
+                                [posting]="post()!"
+                                [isReply]="false"
+                                [isSubscribeToMetis]="false"
+                            />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        }
+
+        @if (isShowSavedPostOptions()) {
+            <div class="posting-summary-saved-post-options">
+                <div class="btn-group btn-group-sm" role="group" aria-label="Saved options">
+                    <button
+                        [disabled]="post()!.savedPostStatus === SavedPostStatus.PROGRESS"
+                        type="button"
+                        class="btn btn-outline-secondary"
+                        ngbTooltip="{{ 'artemisApp.metis.post.bookmarkPostProgress' | artemisTranslate }}"
+                        (click)="onStatusChangeClick(SavedPostStatus.PROGRESS)"
+                    >
+                        <fa-icon [icon]="faBookmark"></fa-icon>
+                    </button>
+                    <button
+                        [disabled]="post()!.savedPostStatus === SavedPostStatus.COMPLETED"
+                        type="button"
+                        class="btn btn-outline-secondary"
+                        ngbTooltip="{{ 'artemisApp.metis.post.bookmarkPostComplete' | artemisTranslate }}"
+                        (click)="onStatusChangeClick(SavedPostStatus.COMPLETED)"
+                    >
+                        <fa-icon [icon]="faCheckSquare"></fa-icon>
+                    </button>
+                    <button
+                        [disabled]="post()!.savedPostStatus === SavedPostStatus.ARCHIVED"
+                        type="button"
+                        class="btn btn-outline-secondary"
+                        ngbTooltip="{{ 'artemisApp.metis.post.bookmarkPostArchived' | artemisTranslate }}"
+                        (click)="onStatusChangeClick(SavedPostStatus.ARCHIVED)"
+                    >
+                        <fa-icon [icon]="faBoxArchive"></fa-icon>
+                    </button>
+                </div>
+            </div>
+        }
+    }
+</div>
diff --git a/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.scss b/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.scss
new file mode 100644
index 000000000000..36fbe43fa303
--- /dev/null
+++ b/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.scss
@@ -0,0 +1,44 @@
+@import 'bootstrap/scss/functions';
+@import 'bootstrap/scss/variables';
+@import 'bootstrap/scss/mixins';
+
+.posting-summary {
+    background-color: transparent;
+    cursor: pointer;
+    position: relative;
+
+    transition: background-color 0.2s ease-in-out;
+}
+
+.posting-summary:hover {
+    background-color: rgba($primary, 0.1);
+
+    & .posting-summary-saved-post-options {
+        opacity: 1;
+    }
+}
+
+.posting-summary-author-content {
+    margin-top: -0.15em;
+}
+
+.posting-summary-saved-post-options {
+    position: absolute;
+    top: 0.3rem;
+    right: 0.3rem;
+    opacity: 0;
+
+    transition: opacity 0.2s ease-in-out;
+}
+
+.posting-summary-content.is-answer-post {
+    padding-left: 0.7rem;
+    margin-left: 0.35rem;
+    border-left: 1px solid $secondary;
+}
+
+@include media-breakpoint-down(sm) {
+    .posting-summary-saved-post-options {
+        opacity: 1;
+    }
+}
diff --git a/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.ts b/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.ts
new file mode 100644
index 000000000000..6e5b23539180
--- /dev/null
+++ b/src/main/webapp/app/overview/course-conversations/posting-summary/posting-summary.component.ts
@@ -0,0 +1,59 @@
+import { Component, effect, input, output } from '@angular/core';
+import { Posting, PostingType, SavedPostStatus } from 'app/entities/metis/posting.model';
+import { faBookmark, faBoxArchive, faCheckSquare, faEllipsis, faHashtag, faLock } from '@fortawesome/free-solid-svg-icons';
+import { ConversationType } from 'app/entities/metis/conversation/conversation.model';
+import dayjs from 'dayjs/esm';
+
+@Component({
+    selector: 'jhi-posting-summary',
+    templateUrl: './posting-summary.component.html',
+    styleUrls: ['./posting-summary.component.scss'],
+})
+export class PostingSummaryComponent {
+    readonly post = input<Posting>();
+    readonly isShowSavedPostOptions = input<boolean>(false);
+
+    readonly onChangeSavedPostStatus = output<SavedPostStatus>();
+    readonly onNavigateToPost = output<Posting>();
+
+    protected readonly ConversationType = ConversationType;
+    protected readonly SavedPostStatus = SavedPostStatus;
+
+    protected isAnswerPost = false;
+    protected postingIsOfToday = false;
+    protected isShowPosting = false;
+    protected isShowSummary = false;
+    protected isShowContent = false;
+
+    // Icons
+    readonly faLock = faLock;
+    readonly faHashtag = faHashtag;
+    readonly faCheckSquare = faCheckSquare;
+    readonly faBookmark = faBookmark;
+    readonly faBoxArchive = faBoxArchive;
+    readonly faEllipsis = faEllipsis;
+
+    constructor() {
+        effect(() => {
+            this.isShowPosting = this.post() !== undefined;
+            this.isShowSummary =
+                this.isShowPosting && this.post()!.conversation !== undefined && this.post()!.conversation!.type !== undefined && this.post()!.conversation!.title !== undefined;
+            this.isShowContent = this.isShowPosting && this.post()!.author !== undefined && this.post()!.content !== undefined && this.post()!.postingType !== undefined;
+            this.isAnswerPost = this.post()?.postingType === PostingType.ANSWER.valueOf();
+            if (this.post()) {
+                this.postingIsOfToday = dayjs().isSame(this.post()!.creationDate, 'day');
+            }
+        });
+    }
+
+    protected onStatusChangeClick(status: SavedPostStatus) {
+        this.onChangeSavedPostStatus.emit(status);
+    }
+
+    protected onTriggerNavigateToPost() {
+        if (this.post() === undefined) {
+            return;
+        }
+        this.onNavigateToPost.emit(this.post()!);
+    }
+}
diff --git a/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.html b/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.html
new file mode 100644
index 000000000000..159e9a163d8d
--- /dev/null
+++ b/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.html
@@ -0,0 +1,33 @@
+<div class="saved-posts pt-2 px-2 d-flex flex-column h-100">
+    <div>
+        <h4 class="mb-0 p-1 pb-0">
+            <span jhiTranslate="artemisApp.metis.overview.savedPosts"></span> (<span [jhiTranslate]="'artemisApp.metis.overview.' + savedPostStatusMap.toString()"></span>)
+        </h4>
+    </div>
+    <hr class="my-2" />
+    @if (isShowDeleteNotice) {
+        <div class="saved-posts-delete-notice m-2 fs-x-small text-secondary">
+            <fa-icon class="me-1" [icon]="faInfoCircle"></fa-icon>
+            <span jhiTranslate="artemisApp.metis.overview.deleteNoticeSavedPosts"></span>
+        </div>
+    }
+    <div class="saved-posts-post-container flex-grow">
+        @if (posts && posts.length > 0) {
+            @for (post of posts; track trackPostFunction($index, post)) {
+                @if (!hiddenPosts.includes(post.id!)) {
+                    <jhi-posting-summary
+                        [post]="post"
+                        [isShowSavedPostOptions]="true"
+                        (onChangeSavedPostStatus)="changeSavedPostStatus(post, $event)"
+                        (onNavigateToPost)="onTriggerNavigateToPost(post)"
+                    ></jhi-posting-summary>
+                }
+            }
+        } @else {
+            <div class="saved-posts-empty-notice text-secondary">
+                <fa-icon class="mb-3" size="3x" [icon]="faBookmark"></fa-icon>
+                <span jhiTranslate="artemisApp.metis.overview.emptySavedPosts"></span>
+            </div>
+        }
+    </div>
+</div>
diff --git a/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.scss b/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.scss
new file mode 100644
index 000000000000..f8ff21b56846
--- /dev/null
+++ b/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.scss
@@ -0,0 +1,14 @@
+.saved-posts-post-container {
+    overflow-y: auto;
+    overflow-x: hidden;
+    height: 100%;
+    max-height: 100%;
+}
+
+.saved-posts-empty-notice {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
diff --git a/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.ts b/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.ts
new file mode 100644
index 000000000000..f3606114b830
--- /dev/null
+++ b/src/main/webapp/app/overview/course-conversations/saved-posts/saved-posts.component.ts
@@ -0,0 +1,64 @@
+import { Component, effect, inject, input, output } from '@angular/core';
+import { Posting, SavedPostStatus, SavedPostStatusMap } from 'app/entities/metis/posting.model';
+import { SavedPostService } from 'app/shared/metis/saved-post.service';
+import { faBookmark, faInfoCircle } from '@fortawesome/free-solid-svg-icons';
+
+@Component({
+    selector: 'jhi-saved-posts',
+    templateUrl: './saved-posts.component.html',
+    styleUrls: ['./saved-posts.component.scss'],
+})
+export class SavedPostsComponent {
+    readonly savedPostStatus = input<SavedPostStatus>();
+    readonly courseId = input<number>();
+
+    readonly onNavigateToPost = output<Posting>();
+
+    private readonly savedPostService = inject(SavedPostService);
+
+    protected posts: Posting[];
+    protected hiddenPosts: number[] = [];
+    protected savedPostStatusMap: SavedPostStatusMap = SavedPostStatusMap.PROGRESS;
+    protected isShowDeleteNotice: boolean = false;
+
+    // Icons
+    readonly faBookmark = faBookmark;
+    readonly faInfoCircle = faInfoCircle;
+
+    constructor() {
+        effect(() => {
+            this.savedPostStatusMap = Posting.statusToMap(this.savedPostStatus()!);
+
+            this.isShowDeleteNotice = this.savedPostStatusMap !== SavedPostStatusMap.PROGRESS;
+
+            this.savedPostService.fetchSavedPosts(this.courseId()!, this.savedPostStatus()!).subscribe({
+                next: (response) => {
+                    if (!response.body) {
+                        this.posts = [];
+                    } else {
+                        this.posts = response.body.map(this.savedPostService.convertPostingToCorrespondingType);
+                    }
+                },
+                error: () => {
+                    this.posts = [];
+                },
+                complete: () => {
+                    this.hiddenPosts = [];
+                },
+            });
+        });
+    }
+
+    protected trackPostFunction = (index: number, post: Posting): string => index + '' + post.id!;
+
+    protected changeSavedPostStatus(post: Posting, status: SavedPostStatus) {
+        this.savedPostService.changeSavedPostStatus(post, status).subscribe({
+            next: () => {},
+        });
+        this.hiddenPosts.push(post.id!);
+    }
+
+    protected onTriggerNavigateToPost(post: Posting) {
+        this.onNavigateToPost.emit(post);
+    }
+}
diff --git a/src/main/webapp/app/overview/course-overview.service.ts b/src/main/webapp/app/overview/course-overview.service.ts
index 0432dc2e361b..1aeb84cf5045 100644
--- a/src/main/webapp/app/overview/course-overview.service.ts
+++ b/src/main/webapp/app/overview/course-overview.service.ts
@@ -11,14 +11,15 @@ import { AccordionGroups, ChannelGroupCategory, SidebarCardElement, TimeGroupCat
 import dayjs from 'dayjs/esm';
 import { cloneDeep } from 'lodash-es';
 import { faGraduationCap } from '@fortawesome/free-solid-svg-icons';
-import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
+import { ConversationDTO, ConversationType } from 'app/entities/metis/conversation/conversation.model';
 import { ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { IconDefinition } from '@fortawesome/fontawesome-svg-core';
-import { faBullhorn, faHashtag, faLock } from '@fortawesome/free-solid-svg-icons';
+import { faBookmark, faBoxArchive, faBullhorn, faHashtag, faLock, faSquareCheck } from '@fortawesome/free-solid-svg-icons';
 import { isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model';
 import { isGroupChatDTO } from 'app/entities/metis/conversation/group-chat.model';
 import { ConversationService } from 'app/shared/metis/conversations/conversation.service';
 import { StudentExam } from 'app/entities/student-exam.model';
+import { SavedPostStatusMap } from 'app/entities/metis/posting.model';
 
 const DEFAULT_UNIT_GROUPS: AccordionGroups = {
     future: { entityData: [] },
@@ -222,6 +223,33 @@ export class CourseOverviewService {
         const channelGroups = messagingEnabled ? { ...DEFAULT_CHANNEL_GROUPS, groupChats: { entityData: [] }, directMessages: { entityData: [] } } : DEFAULT_CHANNEL_GROUPS;
         const groupedConversationGroups = cloneDeep(channelGroups) as AccordionGroups;
 
+        groupedConversationGroups.savedPosts = {
+            isHideCount: true,
+            entityData: [
+                {
+                    title: this.translate.instant('artemisApp.courseOverview.sidebar.progress'),
+                    id: SavedPostStatusMap.PROGRESS.toString(),
+                    type: ConversationType.CHANNEL,
+                    icon: faBookmark,
+                    size: 'S',
+                },
+                {
+                    title: this.translate.instant('artemisApp.courseOverview.sidebar.completed'),
+                    id: SavedPostStatusMap.COMPLETED.toString(),
+                    type: ConversationType.CHANNEL,
+                    icon: faSquareCheck,
+                    size: 'S',
+                },
+                {
+                    title: this.translate.instant('artemisApp.courseOverview.sidebar.archived'),
+                    id: SavedPostStatusMap.ARCHIVED.toString(),
+                    type: ConversationType.CHANNEL,
+                    icon: faBoxArchive,
+                    size: 'S',
+                },
+            ],
+        };
+
         for (const conversation of conversations) {
             const conversationGroup = this.getConversationGroup(conversation);
             const conversationCardItem = this.mapConversationToSidebarCardElement(conversation);
diff --git a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html
index 1579e97f9a0f..8a703757ecfc 100644
--- a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html
+++ b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html
@@ -1,15 +1,25 @@
-<div [id]="'item-' + posting.id" class="row" [ngClass]="isCommunicationPage ? 'module-bg mt-2 rounded-2' : 'answer-post m-1'">
+<div [id]="'item-' + posting.id" class="answer-post" [ngClass]="{ 'module-bg mt-2 rounded-2': isCommunicationPage, 'is-saved': !isConsecutive() && posting.isSaved }">
+    @if (posting.isSaved) {
+        <div class="post-is-saved-message answer-post-content-margin fs-xx-small py-1" [ngClass]="{ 'is-saved': isConsecutive() && posting.isSaved }">
+            <div class="post-is-saved-message-content">
+                <fa-icon [icon]="faBookmark"></fa-icon>
+                <span class="text-secondary" jhiTranslate="artemisApp.metis.post.saved"></span>
+            </div>
+        </div>
+    }
     @if (!isConsecutive()) {
-        <jhi-answer-post-header
-            [posting]="posting"
-            [isReadOnlyMode]="isReadOnlyMode"
-            [isCommunicationPage]="isCommunicationPage"
-            [lastReadDate]="lastReadDate"
-            [isDeleted]="isDeleted"
-        />
+        <div class="ps-3">
+            <jhi-answer-post-header
+                [posting]="posting"
+                [isReadOnlyMode]="isReadOnlyMode"
+                [isCommunicationPage]="isCommunicationPage"
+                [lastReadDate]="lastReadDate"
+                [isDeleted]="isDeleted"
+            />
+        </div>
     }
     @if (!createAnswerPostModal.isInputOpen) {
-        <div class="answer-post-content-margin message-container" (contextmenu)="onRightClick($event)">
+        <div class="answer-post-content-margin message-container" [ngClass]="{ 'is-saved': isConsecutive() && posting.isSaved }" (contextmenu)="onRightClick($event)">
             <div class="message-content" [class.force-hover]="showDropdown">
                 <jhi-posting-content
                     [content]="posting.content"
@@ -34,6 +44,7 @@
                         (mayDeleteOutput)="onMayDelete($event)"
                         (mayEditOutput)="onMayEdit($event)"
                         (isDeleteEvent)="onDeleteEvent(true)"
+                        (onBookmarkClicked)="toggleSavePost()"
                     />
                 </div>
             </div>
@@ -43,7 +54,7 @@
         <ng-container #createEditAnswerPostContainer />
     </div>
     @if (!isDeleted) {
-        <div class="answer-post-content-margin" @fade>
+        <div class="answer-post-content-margin post-reactions-bar" [ngClass]="{ 'is-saved': posting.isSaved && isConsecutive() }" @fade>
             <jhi-answer-post-reactions-bar
                 [isReadOnlyMode]="isReadOnlyMode"
                 [posting]="posting"
@@ -52,6 +63,7 @@
                 (openPostingCreateEditModal)="createAnswerPostModal.open()"
                 (reactionsUpdated)="onReactionsUpdated($event)"
                 [isEmojiCount]="true"
+                (onBookmarkClicked)="toggleSavePost()"
             />
         </div>
     }
@@ -76,6 +88,10 @@
             <span jhiTranslate="artemisApp.metis.post.deleteMessage"></span>
         </button>
     }
+    <button class="dropdown-item d-flex" (click)="toggleSavePost()">
+        <fa-icon [icon]="posting.isSaved ? faBookmark : farBookmark" class="item-icon"></fa-icon>
+        <span [jhiTranslate]="posting.isSaved ? 'artemisApp.metis.post.removeBookmarkPost' : 'artemisApp.metis.post.bookmarkPost'"></span>
+    </button>
 </div>
 
 <div #emojiPickerTrigger="cdkOverlayOrigin" cdkOverlayOrigin [ngStyle]="{ position: 'fixed', 'top.px': clickPosition.y, 'left.px': clickPosition.x }"></div>
diff --git a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.scss b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.scss
index f744b2dafdd3..72c1034f12a7 100644
--- a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.scss
+++ b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.scss
@@ -5,12 +5,11 @@
 @import 'src/main/webapp/app/shared/metis/metis.component';
 
 .answer-post {
-    background-color: var(--metis-answer-post-background-color);
     border-radius: 7px;
 }
 
 .answer-post-content-margin {
-    padding-left: 3.2rem;
+    padding-left: 3.42rem;
 }
 
 @include media-breakpoint-down(sm) {
@@ -37,13 +36,27 @@
 
 .message-container {
     position: relative;
-    border-radius: 5px;
-    transition: background-color 0.3s ease;
 }
 
-.message-content {
-    padding-left: 0.3rem;
+.post-is-saved-message,
+.message-container,
+.post-reactions-bar,
+.answer-post {
+    background-color: transparent;
+
+    transition: background-color 0.2s ease-in-out;
+
+    &.is-saved {
+        background-color: rgba($primary, 0.1);
+    }
+}
 
+.message-content,
+.post-is-saved-message-content {
+    padding-left: 0.25rem;
+}
+
+.message-content {
     &.force-hover {
         background: var(--metis-selection-option-hover-background);
 
diff --git a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts
index ea4d54ba7267..0c16f1be06ce 100644
--- a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts
+++ b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts
@@ -6,6 +6,8 @@ import {
     HostListener,
     Inject,
     Input,
+    OnChanges,
+    OnInit,
     Output,
     Renderer2,
     ViewChild,
@@ -18,7 +20,7 @@ import dayjs from 'dayjs/esm';
 import { animate, style, transition, trigger } from '@angular/animations';
 import { Posting } from 'app/entities/metis/posting.model';
 import { Reaction } from 'app/entities/metis/reaction.model';
-import { faPencilAlt, faSmile, faThumbtack, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faBookmark, faPencilAlt, faSmile, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { DOCUMENT } from '@angular/common';
 import { AnswerPostReactionsBarComponent } from 'app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component';
 
@@ -34,7 +36,7 @@ import { AnswerPostReactionsBarComponent } from 'app/shared/metis/posting-reacti
         ]),
     ],
 })
-export class AnswerPostComponent extends PostingDirective<AnswerPost> {
+export class AnswerPostComponent extends PostingDirective<AnswerPost> implements OnInit, OnChanges {
     @Input() lastReadDate?: dayjs.Dayjs;
     @Input() isLastAnswer: boolean;
     @Output() openPostingCreateEditModal = new EventEmitter<void>();
@@ -45,12 +47,15 @@ export class AnswerPostComponent extends PostingDirective<AnswerPost> {
     @Input()
     isReadOnlyMode = false;
     // ng-container to render answerPostCreateEditModalComponent
+
+    // Icons
+    faBookmark = faBookmark;
+
     @ViewChild('createEditAnswerPostContainer', { read: ViewContainerRef }) containerRef: ViewContainerRef;
     isConsecutive = input<boolean>(false);
     readonly faPencilAlt = faPencilAlt;
     readonly faSmile = faSmile;
     readonly faTrash = faTrash;
-    readonly faThumbtack = faThumbtack;
     static activeDropdownPost: AnswerPostComponent | null = null;
     mayEdit: boolean = false;
     mayDelete: boolean = false;
@@ -64,6 +69,15 @@ export class AnswerPostComponent extends PostingDirective<AnswerPost> {
         super();
     }
 
+    ngOnInit() {
+        super.ngOnInit();
+        this.assignPostingToAnswerPost();
+    }
+
+    ngOnChanges(): void {
+        this.assignPostingToAnswerPost();
+    }
+
     get reactionsBar() {
         return this.reactionsBarComponent;
     }
@@ -133,4 +147,11 @@ export class AnswerPostComponent extends PostingDirective<AnswerPost> {
             this.dropdownPosition.x = screenWidth - dropdownWidth - 10;
         }
     }
+
+    private assignPostingToAnswerPost() {
+        // This is needed because otherwise instanceof returns 'object'.
+        if (this.posting && !(this.posting instanceof AnswerPost)) {
+            this.posting = Object.assign(new AnswerPost(), this.posting);
+        }
+    }
 }
diff --git a/src/main/webapp/app/shared/metis/metis.component.scss b/src/main/webapp/app/shared/metis/metis.component.scss
index 0db317b31ea8..a89058855c11 100644
--- a/src/main/webapp/app/shared/metis/metis.component.scss
+++ b/src/main/webapp/app/shared/metis/metis.component.scss
@@ -31,8 +31,8 @@ $delete-delay-duration: 6s;
     line-height: 1.1;
 }
 
-.post-content-margin {
-    margin-left: 2.65rem;
+.post-content-padding {
+    padding-left: 3.42rem;
 }
 
 .post-authority-icon-student {
@@ -87,7 +87,7 @@ $delete-delay-duration: 6s;
         gap: 0 !important;
     }
 
-    .post-content-margin {
+    .post-content-padding {
         margin-left: 0;
     }
 
diff --git a/src/main/webapp/app/shared/metis/metis.service.ts b/src/main/webapp/app/shared/metis/metis.service.ts
index 0fb2ed3bf277..a4415a2d1cee 100644
--- a/src/main/webapp/app/shared/metis/metis.service.ts
+++ b/src/main/webapp/app/shared/metis/metis.service.ts
@@ -5,8 +5,8 @@ import { HttpResponse } from '@angular/common/http';
 import { User } from 'app/core/user/user.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { Course } from 'app/entities/course.model';
-import { Posting } from 'app/entities/metis/posting.model';
-import { Injectable, OnDestroy } from '@angular/core';
+import { Posting, SavedPostStatus } from 'app/entities/metis/posting.model';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import { AnswerPostService } from 'app/shared/metis/answer-post.service';
 import { AnswerPost } from 'app/entities/metis/answer-post.model';
 import { Reaction } from 'app/entities/metis/reaction.model';
@@ -31,6 +31,8 @@ import { Conversation, ConversationDTO } from 'app/entities/metis/conversation/c
 import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { ConversationService } from 'app/shared/metis/conversations/conversation.service';
 import { NotificationService } from 'app/shared/notification/notification.service';
+import { SavedPostService } from 'app/shared/metis/saved-post.service';
+import { cloneDeep } from 'lodash-es';
 
 @Injectable()
 export class MetisService implements OnDestroy {
@@ -49,6 +51,7 @@ export class MetisService implements OnDestroy {
     private subscriptionChannel?: string;
 
     private courseWideTopicSubscription: Subscription;
+    private savedPostService: SavedPostService = inject(SavedPostService);
 
     constructor(
         protected postService: PostService,
@@ -555,6 +558,54 @@ export class MetisService implements OnDestroy {
         this.jhiWebsocketService.receive(this.subscriptionChannel).subscribe(this.handleNewOrUpdatedMessage);
     }
 
+    public savePost(post: Posting) {
+        this.setIsSavedAndStatusOfPost(post, true, post.savedPostStatus as SavedPostStatus);
+        this.savedPostService.savePost(post).subscribe({
+            next: () => {},
+        });
+        this.posts$.next(this.cachedPosts);
+    }
+
+    public removeSavedPost(post: Posting) {
+        this.setIsSavedAndStatusOfPost(post, false, post.savedPostStatus as SavedPostStatus);
+        this.savedPostService.removeSavedPost(post).subscribe({
+            next: () => {},
+        });
+        this.posts$.next(this.cachedPosts);
+    }
+
+    public changeSavedPostStatus(post: Posting, status: SavedPostStatus) {
+        this.setIsSavedAndStatusOfPost(post, post.isSaved, status);
+        this.savedPostService.changeSavedPostStatus(post, status).subscribe({
+            next: () => {},
+        });
+        this.posts$.next(this.cachedPosts);
+    }
+
+    public resetCachedPosts() {
+        this.cachedPosts = [];
+        this.posts$.next(this.cachedPosts);
+        this.cachedTotalNumberOfPosts = 0;
+        this.totalNumberOfPosts$.next(this.cachedTotalNumberOfPosts);
+    }
+
+    private setIsSavedAndStatusOfPost(post: Posting, isSaved: undefined | boolean, status: undefined | SavedPostStatus) {
+        if (post instanceof AnswerPost) {
+            const indexToUpdate = this.cachedPosts.findIndex((cachedPost) => cachedPost.id === post.post!.id);
+            const indexOfAnswer = this.cachedPosts[indexToUpdate].answers?.findIndex((answer) => answer.id === post.id) ?? -1;
+            const postCopy = cloneDeep(this.cachedPosts[indexToUpdate].answers![indexOfAnswer]);
+            postCopy.isSaved = isSaved;
+            postCopy.savedPostStatus = status?.valueOf();
+            this.cachedPosts[indexToUpdate].answers![indexOfAnswer] = postCopy;
+        } else {
+            const indexToUpdate = this.cachedPosts.findIndex((cachedPost) => cachedPost.id === post.id);
+            const postCopy = cloneDeep(this.cachedPosts[indexToUpdate]);
+            postCopy.isSaved = isSaved;
+            postCopy.savedPostStatus = status?.valueOf();
+            this.cachedPosts[indexToUpdate] = postCopy;
+        }
+    }
+
     private handleNewOrUpdatedMessage = (postDTO: MetisPostDTO): void => {
         const postConvId = postDTO.post.conversation?.id;
         const postIsNotFromCurrentConversation = this.currentPostContextFilter.conversationId && postConvId !== this.currentPostContextFilter.conversationId;
diff --git a/src/main/webapp/app/shared/metis/post/post.component.html b/src/main/webapp/app/shared/metis/post/post.component.html
index 0c014cda695c..053357c4e274 100644
--- a/src/main/webapp/app/shared/metis/post/post.component.html
+++ b/src/main/webapp/app/shared/metis/post/post.component.html
@@ -1,18 +1,28 @@
-<div class="mb-1" [ngClass]="{ 'mx-0': !isThreadSidebar, 'pinned-message': isPinned() }">
+<div class="post" [ngClass]="{ 'mx-0': !isThreadSidebar, 'pinned-message': isPinned(), 'is-saved': !isConsecutive() && posting.isSaved }">
+    @if (posting.isSaved) {
+        <div class="post-is-saved-message post-content-padding fs-xx-small py-1" [ngClass]="{ 'is-saved': isConsecutive() && posting.isSaved }">
+            <div class="post-is-saved-message-content">
+                <fa-icon [icon]="faBookmark"></fa-icon>
+                <span class="text-secondary" jhiTranslate="artemisApp.metis.post.saved"></span>
+            </div>
+        </div>
+    }
     @if (!isConsecutive()) {
-        <jhi-post-header
-            [previewMode]="previewMode"
-            [readOnlyMode]="readOnlyMode"
-            [posting]="posting"
-            [isDeleted]="isDeleted"
-            [isCommunicationPage]="isCommunicationPage"
-            (isModalOpen)="displayInlineInput = true"
-            [lastReadDate]="lastReadDate"
-        />
+        <div class="ps-3">
+            <jhi-post-header
+                [previewMode]="previewMode"
+                [readOnlyMode]="readOnlyMode"
+                [posting]="posting"
+                [isDeleted]="isDeleted"
+                [isCommunicationPage]="isCommunicationPage"
+                (isModalOpen)="displayInlineInput = true"
+                [lastReadDate]="lastReadDate"
+            />
+        </div>
     }
-    <div class="align-items-center post-content-margin">
+    <div class="align-items-center">
         <div class="col">
-            <div class="mb-1">
+            <div>
                 @if (showAnnouncementIcon) {
                     <fa-icon
                         [icon]="faBullhorn"
@@ -27,7 +37,7 @@
                     <span class="col-auto">
                         @if (contextInformation.routerLinkComponents) {
                             <a
-                                class="linked-context-information"
+                                class="linked-context-information post-content-padding ms-1"
                                 [routerLink]="contextInformation.routerLinkComponents"
                                 [queryParams]="contextInformation.queryParams"
                                 (click)="onNavigateToContext($event)"
@@ -36,7 +46,7 @@
                             >
                         }
                         @if (!contextInformation.routerLinkComponents) {
-                            <span class="context-information">{{ contextInformation.displayName }}:</span>
+                            <span class="context-information post-content-padding ms-1">{{ contextInformation.displayName }}:</span>
                         }
                     </span>
                 }
@@ -44,13 +54,18 @@
                 @if (pageType !== PageType.PLAGIARISM_CASE_INSTRUCTOR && pageType !== PageType.PLAGIARISM_CASE_STUDENT) {
                     <span class="col-auto">
                         @if (posting.title?.length) {
-                            <span class="post-title">{{ posting.title }}</span>
+                            <span class="post-title post-content-padding ms-1">{{ posting.title }}</span>
                         }
                     </span>
                 }
             </div>
             @if (!displayInlineInput) {
-                <div class="message-container" [class.force-hover]="showDropdown" (contextmenu)="onRightClick($event)">
+                <div
+                    class="message-container post-content-padding"
+                    [ngClass]="{ 'is-saved': isConsecutive() && posting.isSaved }"
+                    [class.force-hover]="showDropdown"
+                    (contextmenu)="onRightClick($event)"
+                >
                     <div class="message-content" [ngClass]="{ 'mx-0': !isThreadSidebar }">
                         <jhi-posting-content
                             [previewMode]="previewMode"
@@ -65,7 +80,7 @@
                             (userReferenceClicked)="onUserReferenceClicked($event)"
                             (channelReferenceClicked)="onChannelReferenceClicked($event)"
                         ></jhi-posting-content>
-                        <div class="hover-actions post-content-margin" [ngClass]="{ 'mb-2': previewMode }">
+                        <div class="hover-actions" [ngClass]="{ 'mb-2': previewMode }">
                             @if (!previewMode) {
                                 <!-- Post reactions (that appear when post is hovered) -->
                                 <jhi-post-reactions-bar
@@ -84,6 +99,7 @@
                                     (mayDeleteOutput)="onMayDelete($event)"
                                     (canPinOutput)="onCanPin($event)"
                                     (isDeleteEvent)="onDeleteEvent(true)"
+                                    (onBookmarkClicked)="toggleSavePost()"
                                 />
                             }
                         </div>
@@ -93,13 +109,13 @@
         </div>
     </div>
     @if (!isDeleted && displayInlineInput && !readOnlyMode) {
-        <div class="post-content-margin">
+        <div class="post-content-padding">
             <jhi-message-inline-input [posting]="posting" (isModalOpen)="displayInlineInput = false" />
         </div>
     }
     @if (!isDeleted) {
-        <div class="post-content-margin justify-content-between" [ngClass]="{ 'mb-2': previewMode }">
-            <!-- Post reactions (to show replies & reactions under the post) -->
+        <div class="post-content-padding justify-content-between post-reactions-bar" [ngClass]="{ 'mb-2': previewMode, 'is-saved': posting.isSaved && isConsecutive() }">
+            <!-- Post reactions -->
             @if (!previewMode) {
                 <jhi-post-reactions-bar
                     [lastReadDate]="lastReadDate"
@@ -116,6 +132,7 @@
                     (isModalOpen)="displayInlineInput = true"
                     [isEmojiCount]="true"
                     [hoverBar]="false"
+                    (onBookmarkClicked)="toggleSavePost()"
                 />
             }
         </div>
@@ -166,6 +183,10 @@
         <fa-icon [icon]="faComments" class="item-icon"></fa-icon>
         <span jhiTranslate="artemisApp.metis.post.replyMessage"></span>
     </button>
+    <button class="dropdown-item d-flex" (click)="toggleSavePost()">
+        <fa-icon [icon]="posting.isSaved ? faBookmark : farBookmark" class="item-icon"></fa-icon>
+        <span [jhiTranslate]="posting.isSaved ? 'artemisApp.metis.post.removeBookmarkPost' : 'artemisApp.metis.post.bookmarkPost'"></span>
+    </button>
 </div>
 
 <div #emojiPickerTrigger="cdkOverlayOrigin" cdkOverlayOrigin [ngStyle]="{ position: 'fixed', 'top.px': clickPosition.y, 'left.px': clickPosition.x }"></div>
diff --git a/src/main/webapp/app/shared/metis/post/post.component.scss b/src/main/webapp/app/shared/metis/post/post.component.scss
index 10cb7ef83132..43ae9a2bbcd9 100644
--- a/src/main/webapp/app/shared/metis/post/post.component.scss
+++ b/src/main/webapp/app/shared/metis/post/post.component.scss
@@ -34,8 +34,6 @@
 
 .message-container {
     position: relative;
-    border-radius: 5px;
-    transition: background-color 0.3s ease;
 
     &.force-hover {
         background: var(--metis-selection-option-hover-background);
@@ -47,8 +45,22 @@
     }
 }
 
-.message-content {
-    padding-left: 0.3rem;
+.post-is-saved-message,
+.message-container,
+.post-reactions-bar,
+.post {
+    background-color: transparent;
+
+    transition: background-color 0.2s ease-in-out;
+
+    &.is-saved {
+        background-color: rgba($primary, 0.1);
+    }
+}
+
+.message-content,
+.post-is-saved-message-content {
+    padding-left: 0.25rem;
 }
 
 .message-content:hover {
diff --git a/src/main/webapp/app/shared/metis/post/post.component.ts b/src/main/webapp/app/shared/metis/post/post.component.ts
index 7bfe1d0c6f49..5deafdbd287b 100644
--- a/src/main/webapp/app/shared/metis/post/post.component.ts
+++ b/src/main/webapp/app/shared/metis/post/post.component.ts
@@ -20,7 +20,7 @@ import { PostingDirective } from 'app/shared/metis/posting.directive';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ContextInformation, DisplayPriority, PageType, RouteComponents } from '../metis.util';
-import { faBullhorn, faComments, faPencilAlt, faSmile, faThumbtack, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faBookmark, faBullhorn, faCheckSquare, faComments, faPencilAlt, faSmile, faThumbtack, faTrash } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
 import { PostFooterComponent } from 'app/shared/metis/posting-footer/post-footer/post-footer.component';
 import { OneToOneChatService } from 'app/shared/metis/conversations/one-to-one-chat.service';
@@ -88,6 +88,8 @@ export class PostComponent extends PostingDirective<Post> implements OnInit, OnC
     readonly faSmile = faSmile;
     readonly faTrash = faTrash;
     readonly faThumbtack = faThumbtack;
+    readonly faCheckSquare = faCheckSquare;
+    readonly faBookmark = faBookmark;
 
     isConsecutive = input<boolean>(false);
     dropdownPosition = { x: 0, y: 0 };
@@ -184,6 +186,7 @@ export class PostComponent extends PostingDirective<Post> implements OnInit, OnC
         this.contextInformation = this.metisService.getContextInformation(this.posting);
         this.isAtLeastTutorInCourse = this.metisService.metisUserIsAtLeastTutorInCourse();
         this.sortAnswerPosts();
+        this.assignPostingToPost();
     }
 
     /**
@@ -195,6 +198,7 @@ export class PostComponent extends PostingDirective<Post> implements OnInit, OnC
         this.queryParams = this.metisService.getQueryParamsForPost(this.posting);
         this.showAnnouncementIcon = (getAsChannelDTO(this.posting.conversation)?.isAnnouncementChannel && this.showChannelReference) ?? false;
         this.sortAnswerPosts();
+        this.assignPostingToPost();
     }
 
     /**
@@ -287,4 +291,11 @@ export class PostComponent extends PostingDirective<Post> implements OnInit, OnC
             }
         }
     }
+
+    private assignPostingToPost() {
+        // This is needed because otherwise instanceof returns 'object'.
+        if (this.posting && !(this.posting instanceof Post)) {
+            this.posting = Object.assign(new Post(), this.posting);
+        }
+    }
 }
diff --git a/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html b/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html
index 86d8860b100d..ecf25fe3a3bb 100644
--- a/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html
+++ b/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html
@@ -6,7 +6,7 @@
             <span class="post-delete-button-background"></span>
         </button>
     </span>
-} @else if (currentlyLoadedPosts) {
+} @else {
     <!-- in preview mode (showing similar posts during creation): content can be expanded and collapsed shown -->
     @if (previewMode) {
         <div class="pb-1">
diff --git a/src/main/webapp/app/shared/metis/posting-content/posting-content.components.ts b/src/main/webapp/app/shared/metis/posting-content/posting-content.components.ts
index 64136d0f3378..2d8b84e2b71b 100644
--- a/src/main/webapp/app/shared/metis/posting-content/posting-content.components.ts
+++ b/src/main/webapp/app/shared/metis/posting-content/posting-content.components.ts
@@ -25,11 +25,12 @@ export class PostingContentComponent implements OnInit, OnChanges, OnDestroy {
     @Output() userReferenceClicked = new EventEmitter<string>();
     @Output() channelReferenceClicked = new EventEmitter<number>();
     isDeleted = input<boolean>(false);
+    isSubscribeToMetis = input<boolean>(true);
     deleteTimerInSeconds = input<number>(0);
     onUndoDeleteEvent = output<void>();
 
     showContent = false;
-    currentlyLoadedPosts: Post[];
+    currentlyLoadedPosts: Post[] = [];
     postingContentParts = signal<PostingContentPart[]>([]);
 
     private postsSubscription: Subscription;
@@ -47,14 +48,21 @@ export class PostingContentComponent implements OnInit, OnChanges, OnDestroy {
      * on initialization: calculate posting parts to be displayed
      */
     ngOnInit(): void {
-        this.computeContentPartsOfPosts();
+        if (!this.isSubscribeToMetis()) {
+            const patternMatches: PatternMatch[] = this.getPatternMatches();
+            this.computePostingContentParts(patternMatches);
+        } else {
+            this.computeContentPartsOfPosts();
+        }
     }
 
     /**
      * on changes: update posting parts to be displayed
      */
     ngOnChanges(): void {
-        this.computeContentPartsOfPosts();
+        if (!this.isSubscribeToMetis()) {
+            this.computeContentPartsOfPosts();
+        }
     }
 
     /**
diff --git a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts
index bb1ff3cbbbd2..45bd9775fd06 100644
--- a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts
@@ -1,10 +1,8 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
 import { AnswerPost } from 'app/entities/metis/answer-post.model';
 import { PostingHeaderDirective } from 'app/shared/metis/posting-header/posting-header.directive';
-import { MetisService } from 'app/shared/metis/metis.service';
 import { faCheck, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
-import { AccountService } from 'app/core/auth/account.service';
 
 @Component({
     selector: 'jhi-answer-post-header',
@@ -22,13 +20,6 @@ export class AnswerPostHeaderComponent extends PostingHeaderDirective<AnswerPost
     readonly faCheck = faCheck;
     readonly faPencilAlt = faPencilAlt;
 
-    constructor(
-        protected metisService: MetisService,
-        protected accountService: AccountService,
-    ) {
-        super(metisService, accountService);
-    }
-
     ngOnInit() {
         super.ngOnInit();
     }
diff --git a/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts b/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts
index fe4bc129addd..2d45812fe382 100644
--- a/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts
@@ -1,12 +1,10 @@
 import { Component, Input, OnChanges, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { Post } from 'app/entities/metis/post.model';
 import { PostingHeaderDirective } from 'app/shared/metis/posting-header/posting-header.directive';
-import { MetisService } from 'app/shared/metis/metis.service';
 import { PostCreateEditModalComponent } from 'app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component';
 import { faCheckSquare, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
 import { CachingStrategy } from 'app/shared/image/secured-image.component';
-import { AccountService } from 'app/core/auth/account.service';
 
 @Component({
     selector: 'jhi-post-header',
@@ -25,13 +23,6 @@ export class PostHeaderComponent extends PostingHeaderDirective<Post> implements
     readonly faPencilAlt = faPencilAlt;
     readonly faCheckSquare = faCheckSquare;
 
-    constructor(
-        protected metisService: MetisService,
-        protected accountService: AccountService,
-    ) {
-        super(metisService, accountService);
-    }
-
     ngOnInit() {
         super.ngOnInit();
     }
diff --git a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
index f07ef5e1ed04..8868f60124c1 100644
--- a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
+++ b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
@@ -1,5 +1,5 @@
 import { Posting } from 'app/entities/metis/posting.model';
-import { Directive, EventEmitter, Input, OnInit, Output, input } from '@angular/core';
+import { Directive, EventEmitter, Input, OnInit, Output, inject, input } from '@angular/core';
 import dayjs from 'dayjs/esm';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { UserRole } from 'app/shared/metis/metis.util';
@@ -29,10 +29,8 @@ export abstract class PostingHeaderDirective<T extends Posting> implements OnIni
     userAuthorityTooltip: string;
     currentUser?: User;
 
-    protected constructor(
-        protected metisService: MetisService,
-        protected accountService: AccountService,
-    ) {}
+    protected metisService: MetisService = inject(MetisService);
+    protected accountService: AccountService = inject(AccountService);
 
     /**
      * on initialization: determines if user is at least tutor in the course and if user is author of posting by invoking the metis service,
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
index 1d0c14bff56f..d19d55ec56df 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
@@ -88,6 +88,13 @@
                     />
                 </button>
             }
+            <button
+                class="reaction-button clickable px-2 fs-small bookmark"
+                (click)="bookmarkPosting()"
+                [ngbTooltip]="(posting.isSaved ? 'artemisApp.metis.post.removeBookmarkPost' : 'artemisApp.metis.post.bookmarkPost') | artemisTranslate"
+            >
+                <fa-icon [icon]="posting.isSaved ? faBookmark : farBookmark" cdkOverlayOrigin></fa-icon>
+            </button>
         }
     </div>
 </div>
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
index c287db1b1d7b..eed3ef65d59e 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
@@ -19,6 +19,7 @@ export class AnswerPostReactionsBarComponent extends PostingsReactionsBarDirecti
     // Icons
     readonly farSmile = faSmile;
     readonly faCheck = faCheck;
+
     @Output() openPostingCreateEditModal = new EventEmitter<void>();
     isAuthorOfOriginalPost: boolean;
     isAnswerOfAnnouncement: boolean;
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
index bf818ff12160..a1b39c6f61c2 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
@@ -131,6 +131,15 @@
                 <jhi-emoji class="fs-x-small" [emoji]="pinEmojiId" [ngbTooltip]="pinTooltip | artemisTranslate" [placement]="'auto'" />
             </button>
         }
+        @if (!isEmojiCount) {
+            <button
+                class="reaction-button clickable px-2 fs-small bookmark"
+                (click)="bookmarkPosting()"
+                [ngbTooltip]="(posting.isSaved ? 'artemisApp.metis.post.removeBookmarkPost' : 'artemisApp.metis.post.bookmarkPost') | artemisTranslate"
+            >
+                <fa-icon [icon]="posting.isSaved ? faBookmark : farBookmark" cdkOverlayOrigin></fa-icon>
+            </button>
+        }
     </div>
     <div>
         @if (isEmojiCount && getShowNewMessageIcon()) {
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.directive.ts b/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.directive.ts
index e3847cf48c34..c8877be83b9c 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.directive.ts
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.directive.ts
@@ -4,6 +4,8 @@ import { MetisService } from 'app/shared/metis/metis.service';
 import { EmojiData } from '@ctrl/ngx-emoji-mart/ngx-emoji';
 import { Reaction } from 'app/entities/metis/reaction.model';
 import { PLACEHOLDER_USER_REACTED } from 'app/shared/pipes/reacting-users-on-posting.pipe';
+import { faBookmark } from '@fortawesome/free-solid-svg-icons';
+import { faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
 
 const PIN_EMOJI_ID = 'pushpin';
 const ARCHIVE_EMOJI_ID = 'open_file_folder';
@@ -58,6 +60,11 @@ export abstract class PostingsReactionsBarDirective<T extends Posting> implement
     isAuthorOfPosting: boolean;
     @Output() isModalOpen = new EventEmitter<void>();
     isDeleteEvent = output<boolean>();
+    readonly onBookmarkClicked = output<void>();
+
+    // Icons
+    readonly farBookmark = farBookmark;
+    readonly faBookmark = faBookmark;
 
     /*
      * icons (as svg paths) to be used as category preview image in emoji mart selector
@@ -209,4 +216,8 @@ export abstract class PostingsReactionsBarDirective<T extends Posting> implement
             return { ...metaDataMap, [reaction.emojiId!]: reactionMetaData };
         }, {});
     }
+
+    protected bookmarkPosting() {
+        this.onBookmarkClicked.emit();
+    }
 }
diff --git a/src/main/webapp/app/shared/metis/posting.directive.ts b/src/main/webapp/app/shared/metis/posting.directive.ts
index 7e601e30d3ca..f62af4907e18 100644
--- a/src/main/webapp/app/shared/metis/posting.directive.ts
+++ b/src/main/webapp/app/shared/metis/posting.directive.ts
@@ -2,6 +2,8 @@ import { Posting } from 'app/entities/metis/posting.model';
 import { ChangeDetectorRef, Directive, Input, OnDestroy, OnInit, inject } from '@angular/core';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { DisplayPriority } from 'app/shared/metis/metis.util';
+import { faBookmark } from '@fortawesome/free-solid-svg-icons';
+import { faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
 
 @Directive()
 export abstract class PostingDirective<T extends Posting> implements OnInit, OnDestroy {
@@ -29,6 +31,10 @@ export abstract class PostingDirective<T extends Posting> implements OnInit, OnD
     protected metisService = inject(MetisService);
     protected changeDetector = inject(ChangeDetectorRef);
 
+    // Icons
+    farBookmark = farBookmark;
+    faBookmark = faBookmark;
+
     ngOnInit(): void {
         this.content = this.posting.content;
     }
@@ -115,4 +121,14 @@ export abstract class PostingDirective<T extends Posting> implements OnInit, OnD
     toggleEmojiSelect() {
         this.showReactionSelector = !this.showReactionSelector;
     }
+
+    protected toggleSavePost() {
+        if (this.posting.isSaved) {
+            this.metisService.removeSavedPost(this.posting);
+            this.posting.isSaved = false;
+        } else {
+            this.metisService.savePost(this.posting);
+            this.posting.isSaved = true;
+        }
+    }
 }
diff --git a/src/main/webapp/app/shared/metis/saved-post.service.ts b/src/main/webapp/app/shared/metis/saved-post.service.ts
new file mode 100644
index 000000000000..b0b871c2cd19
--- /dev/null
+++ b/src/main/webapp/app/shared/metis/saved-post.service.ts
@@ -0,0 +1,98 @@
+import { Injectable, inject } from '@angular/core';
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { Post } from 'app/entities/metis/post.model';
+import { Posting, PostingType, SavedPostStatus } from 'app/entities/metis/posting.model';
+import { map } from 'rxjs/operators';
+import { convertDateFromServer } from 'app/utils/date.utils';
+import { ConversationType } from 'app/entities/metis/conversation/conversation.model';
+import { AnswerPost } from 'app/entities/metis/answer-post.model';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class SavedPostService {
+    private resourceUrl = 'api/saved-posts/';
+
+    private readonly http: HttpClient = inject(HttpClient);
+
+    /**
+     * saves a post
+     * @param {Posting} post
+     * @return {Observable<Object>}
+     */
+    public savePost(post: Posting): Observable<object> {
+        const type = this.getPostingType(post).toString();
+
+        return this.http.post(`${this.resourceUrl}${post.id}/${type}`, {}, { observe: 'response' });
+    }
+
+    /**
+     * un-saves a post
+     * @param {Posting} post
+     * @return {Observable<Object>}
+     */
+    public removeSavedPost(post: Posting): Observable<object> {
+        const type = this.getPostingType(post).toString();
+
+        return this.http.delete(`${this.resourceUrl}${post.id}/${type}`, { observe: 'response' });
+    }
+
+    /**
+     * updates a posts status
+     * @param {Posting} post
+     * @param {SavedPostStatus} status of a post (progress, archived, completed)
+     * @return {Observable<Object>}
+     */
+    public changeSavedPostStatus(post: Posting, status: SavedPostStatus): Observable<object> {
+        const type = this.getPostingType(post).toString();
+
+        return this.http.put(`${this.resourceUrl}${post.id}/${type}?status=${status.toString()}`, null, { observe: 'response' });
+    }
+
+    /**
+     * Fetches the saved postings for a given status
+     * @param {number} courseId
+     * @param {SavedPostStatus} status
+     * @return {Observable<Posting[]>}
+     */
+    public fetchSavedPosts(courseId: number, status: SavedPostStatus): Observable<HttpResponse<Posting[]>> {
+        return this.http.get(`${this.resourceUrl}${courseId}/${status.toString()}`, { observe: 'response' }).pipe(map(this.convertPostResponseFromServer));
+    }
+
+    /**
+     * Converts posting to the corresponding type
+     * @param {Posting} post to convert
+     * @return {Post|AnswerPost}
+     */
+    public convertPostingToCorrespondingType(post: Posting) {
+        return Object.assign((post.postingType as PostingType) === PostingType.POST ? new Post() : new AnswerPost(), post);
+    }
+
+    /**
+     * takes an array of postings and converts the date from the server
+     * @param   {HttpResponse<Posting[]>} res
+     * @return  {HttpResponse<Posting[]>}
+     */
+    private convertPostResponseFromServer(res: HttpResponse<Posting[]>): HttpResponse<Posting[]> {
+        if (res.body) {
+            res.body.forEach((post) => {
+                post.creationDate = convertDateFromServer(post.creationDate);
+                post.updatedDate = convertDateFromServer(post.updatedDate);
+                if (post.conversation?.type !== undefined) {
+                    post.conversation.type = post.conversation.type.toLowerCase() as ConversationType;
+                }
+            });
+        }
+        return res;
+    }
+
+    /**
+     * Retrieves the proper enum type for a posting
+     * @param {Posting} post
+     * @return {PostingType}
+     */
+    private getPostingType(post: Posting): PostingType {
+        return post instanceof Post ? PostingType.POST : PostingType.ANSWER;
+    }
+}
diff --git a/src/main/webapp/app/shared/server-date.service.ts b/src/main/webapp/app/shared/server-date.service.ts
index 23ee0c2cbc61..c13e9b126a45 100644
--- a/src/main/webapp/app/shared/server-date.service.ts
+++ b/src/main/webapp/app/shared/server-date.service.ts
@@ -36,7 +36,7 @@ export class ArtemisServerDateService implements ServerDateService {
         const now = dayjs(new Date());
         if (this.recentClientDates.length > 4) {
             // only if some recent client dates (i.e. recent syncs) are older than 60s
-            shouldSync = this.recentClientDates.some((recentClientDate) => now.diff(recentClientDate, 's') > 60);
+            shouldSync = this.recentClientDates.some((recentClientDate) => Math.abs(now.diff(recentClientDate, 's')) > 60);
         } else {
             // definitely sync if we do not have 5 elements yet
             shouldSync = true;
diff --git a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html
index 92d7b034e785..895cc5ea858a 100644
--- a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html
+++ b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html
@@ -11,7 +11,9 @@
                         <fa-icon [fixedWidth]="true" [icon]="$any(channelTypeIcon)?.[groupKey]" />
                     }
                     {{ 'artemisApp.courseOverview.sidebar.' + groupKey | artemisTranslate | titlecase }}
-                    ({{ (groupedData[groupKey].entityData | searchFilter: ['title', 'type'] : searchValue)?.length }})
+                    @if (!groupedData[groupKey].isHideCount) {
+                        ({{ (groupedData[groupKey].entityData | searchFilter: ['title', 'type'] : searchValue)?.length }})
+                    }
                 </div>
                 <div class="icon-container pe-3">
                     @if (totalUnreadMessagesPerGroup[groupKey] > 0 && collapseState[groupKey]) {
diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.ts b/src/main/webapp/app/shared/sidebar/sidebar.component.ts
index 99903955e980..f3ea292820bb 100644
--- a/src/main/webapp/app/shared/sidebar/sidebar.component.ts
+++ b/src/main/webapp/app/shared/sidebar/sidebar.component.ts
@@ -22,7 +22,7 @@ import { ExerciseFilterModalComponent } from 'app/shared/exercise-filter/exercis
     styleUrls: ['./sidebar.component.scss'],
 })
 export class SidebarComponent implements OnDestroy, OnChanges, OnInit {
-    @Output() onSelectConversation = new EventEmitter<number>();
+    @Output() onSelectConversation = new EventEmitter<number | string>();
     @Output() onUpdateSidebar = new EventEmitter<void>();
     onDirectChatPressed = output<void>();
     onGroupChatPressed = output<void>();
@@ -117,7 +117,7 @@ export class SidebarComponent implements OnDestroy, OnChanges, OnInit {
             if (itemId) {
                 this.storeLastSelectedItem(itemId);
                 if (this.sidebarData.sidebarType == 'conversation') {
-                    this.onSelectConversation.emit(+itemId);
+                    this.onSelectConversation.emit(itemId);
                     this.onUpdateSidebar.emit();
                 }
             }
diff --git a/src/main/webapp/app/types/sidebar.ts b/src/main/webapp/app/types/sidebar.ts
index 6eed6d06cb40..685bd3069cda 100644
--- a/src/main/webapp/app/types/sidebar.ts
+++ b/src/main/webapp/app/types/sidebar.ts
@@ -10,7 +10,10 @@ export type TimeGroupCategory = 'past' | 'current' | 'dueSoon' | 'future' | 'noD
 export type ExamGroupCategory = 'real' | 'test';
 export type TutorialGroupCategory = 'all' | 'registered' | 'further';
 export type SidebarTypes = 'exercise' | 'exam' | 'inExam' | 'conversation' | 'default';
-export type AccordionGroups = Record<TimeGroupCategory | TutorialGroupCategory | ExamGroupCategory | ChannelGroupCategory | string, { entityData: SidebarCardElement[] }>;
+export type AccordionGroups = Record<
+    TimeGroupCategory | TutorialGroupCategory | ExamGroupCategory | ChannelGroupCategory | string,
+    { entityData: SidebarCardElement[]; isHideCount?: boolean }
+>;
 export type ChannelGroupCategory =
     | 'favoriteChannels'
     | 'generalChannels'
@@ -19,6 +22,7 @@ export type ChannelGroupCategory =
     | 'groupChats'
     | 'directMessages'
     | 'examChannels'
+    | 'savedPosts'
     | 'hiddenChannels';
 export type CollapseState = {
     [key: string]: boolean;
diff --git a/src/main/webapp/app/utils/date.utils.ts b/src/main/webapp/app/utils/date.utils.ts
index d05d241f29f1..57ea6bfe6d25 100644
--- a/src/main/webapp/app/utils/date.utils.ts
+++ b/src/main/webapp/app/utils/date.utils.ts
@@ -75,6 +75,7 @@ export function dayOfWeekZeroSundayToZeroMonday(dayOfWeekZeroSunday: number): nu
     return (dayOfWeekZeroSunday + 6) % 7;
 }
 
-export function isDateLessThanAWeekInTheFuture(date: dayjs.Dayjs): boolean {
-    return date.isBetween(dayjs().add(1, 'week'), dayjs());
+export function isDateLessThanAWeekInTheFuture(date: dayjs.Dayjs, compareTime?: dayjs.Dayjs): boolean {
+    const now = compareTime ?? dayjs();
+    return date.isBetween(now.add(1, 'week'), now);
 }
diff --git a/src/main/webapp/i18n/de/buildAgents.json b/src/main/webapp/i18n/de/buildAgents.json
index 186bd1432540..bad9a78469d3 100644
--- a/src/main/webapp/i18n/de/buildAgents.json
+++ b/src/main/webapp/i18n/de/buildAgents.json
@@ -22,10 +22,15 @@
                 "buildAgentResumed": "Anfrage zum Fortsetzen des BuildJobs erfolgreich gesendet. Der Agent wird wieder neue BuildJobs annehmen.",
                 "buildAgentPauseFailed": "Anhalten des Build-Agenten fehlgeschlagen.",
                 "buildAgentResumeFailed": "Fortsetzen des Build-Agenten fehlgeschlagen.",
-                "buildAgentWithoutName": "Der Name des Build-Agenten ist erforderlich."
+                "buildAgentWithoutName": "Der Name des Build-Agenten ist erforderlich.",
+                "buildAgentsPaused": "Anfrage zum Anhalten aller Build-Agenten erfolgreich gesendet. Die Agenten akzeptieren keine neuen Build-Jobs und werden die aktuellen Build-Jobs entweder ordnungsgemäß beenden oder nach einer konfigurierbaren Anzahl von Sekunden abbrechen.",
+                "buildAgentsResumed": "Anfrage zum Fortsetzen aller Build-Agenten erfolgreich gesendet. Die Agenten werden wieder neue Build-Jobs annehmen."
             },
             "pause": "Anhalten",
-            "resume": "Fortsetzen"
+            "resume": "Fortsetzen",
+            "pauseAll": "Alle Agenten Anhalten",
+            "resumeAll": "Alle Agenten fortsetzen",
+            "pauseAllWarning": "Du bist dabei, alle Build-Agenten anzuhalten. Dies wird verhindern, dass sie neue Build-Jobs verarbeiten.\nBist du sicher, dass du fortfahren möchtest?"
         }
     }
 }
diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json
index d0a399af4023..f0994d9284b1 100644
--- a/src/main/webapp/i18n/de/metis.json
+++ b/src/main/webapp/i18n/de/metis.json
@@ -27,6 +27,7 @@
             "createModalTitleAnswer": "Antwort erstellen",
             "editPosting": "Inhalt bearbeiten",
             "edited": "(bearbeitet)",
+            "saveForLater": "Für später speichern",
             "markAsResolvingAnswerTooltip": "Bestätige, dass die ursprüngliche Nachricht durch diese Antwort geklärt wird",
             "resolvingAnswerTooltip": "Die ursprüngliche Nachricht wird durch diese Antwort geklärt",
             "unmarkAsResolvingAnswerTooltip": "Widerrufe, dass die ursprüngliche Nachricht durch diese Antwort geklärt wird",
@@ -95,7 +96,13 @@
                 "allPublicMessages": "Alle öffentlichen Nachrichten",
                 "searchResults": "Suchergebnisse für {{ search }}",
                 "mobileDisclaimer": "Bitte erst eine Konversation auswählen.",
-                "mobileDisclaimerCallToAction": "Konversation wählen"
+                "mobileDisclaimerCallToAction": "Konversation wählen",
+                "savedPosts": "Gespeicherte Nachrichten",
+                "progress": "In Bearbeitung",
+                "completed": "Erledigt",
+                "archived": "Archiviert",
+                "emptySavedPosts": "Hier ist noch nichts. Speichere Nachrichten, damit sie hier auftauchen.",
+                "deleteNoticeSavedPosts": "Erledigte und archivierte Lesezeichen werden nach 100 Tagen gelöscht."
             },
             "post": {
                 "context": "Kontext",
@@ -134,7 +141,14 @@
                 "deleteMessage": "Nachricht löschen",
                 "replyMessage": "Antworten im Thread",
                 "deletedContent": "Beitrag wird in {{ progress }} Sekunde(n) gelöscht.",
-                "undoDelete": "Löschen umkehren"
+                "undoDelete": "Löschen umkehren",
+                "bookmarkPost": "Beitrag speichern",
+                "removeBookmarkPost": "Beitrag nicht mehr speichern",
+                "bookmarkPostProgress": "Beitrag als in Bearbeitung speichern",
+                "bookmarkPostArchived": "Gespeicherten Beitrag archivieren",
+                "bookmarkPostComplete": "Gespeicherten Beitrag als Abgeschlossen markieren",
+                "thread": "Thread",
+                "saved": "Für später gespeichert"
             },
             "answerPost": {
                 "created": "Antwort erfolgreich erstellt",
diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json
index 6c72a925727c..642af5f892fc 100644
--- a/src/main/webapp/i18n/de/student-dashboard.json
+++ b/src/main/webapp/i18n/de/student-dashboard.json
@@ -67,6 +67,10 @@
                 "notFound": "Keine Konversation gefunden",
                 "favoriteChannels": "Favoriten",
                 "hiddenChannels": "Ausgeblendet",
+                "savedPosts": "Gespeicherte Beiträge",
+                "progress": "In Bearbeitung",
+                "completed": "Erledigt",
+                "archived": "Archiviert",
                 "channels": "Kanäle",
                 "generalChannels": "Allgemein",
                 "exerciseChannels": "Aufgaben",
diff --git a/src/main/webapp/i18n/en/buildAgents.json b/src/main/webapp/i18n/en/buildAgents.json
index 974086655128..ce0cf7620104 100644
--- a/src/main/webapp/i18n/en/buildAgents.json
+++ b/src/main/webapp/i18n/en/buildAgents.json
@@ -20,12 +20,17 @@
             "alerts": {
                 "buildAgentPaused": "Build agent pause request sent successfully. The agent will not accept new build jobs and will gracefully finish the current build jobs or will cancel them after a configurable seconds.",
                 "buildAgentResumed": "Build agent resume request sent successfully. The agent will start accepting new build jobs.",
-                "buildAgentPauseFailed": "Failed to pause the build agent.",
-                "buildAgentResumeFailed": "Failed to resume the build agent.",
-                "buildAgentWithoutName": "Build agent name is required."
+                "buildAgentPauseFailed": "Failed to pause build agent.",
+                "buildAgentResumeFailed": "Failed to resume build agent.",
+                "buildAgentWithoutName": "Build agent name is required.",
+                "buildAgentsPaused": "Pause request sent to all build agents. The agents will not accept new build jobs and will gracefully finish the current build jobs or will cancel them after a configurable seconds.",
+                "buildAgentsResumed": "Resume request sent to all build agents. The agents will start accepting new build jobs."
             },
             "pause": "Pause",
-            "resume": "Resume"
+            "resume": "Resume",
+            "pauseAll": "Pause All Agents",
+            "resumeAll": "Resume All Agents",
+            "pauseAllWarning": "You are about to pause all build agents. This will prevent them from processing any new build jobs.\nAre you sure you want to proceed?"
         }
     }
 }
diff --git a/src/main/webapp/i18n/en/metis.json b/src/main/webapp/i18n/en/metis.json
index b327085c2f56..1c604a215ce0 100644
--- a/src/main/webapp/i18n/en/metis.json
+++ b/src/main/webapp/i18n/en/metis.json
@@ -27,6 +27,7 @@
             "createModalTitleAnswer": "Create reply",
             "editPosting": "Edit content",
             "edited": "(edited)",
+            "saveForLater": "Save for later",
             "markAsResolvingAnswerTooltip": "Confirm that this reply resolves the original message",
             "unmarkAsResolvingAnswerTooltip": "Revoke that this reply resolves the original message",
             "resolvingAnswerTooltip": "This reply resolves the original message",
@@ -95,7 +96,13 @@
                 "allPublicMessages": "All Public Messages",
                 "searchResults": "Search Results for '{{ search }}'",
                 "mobileDisclaimer": "Please select a conversation first.",
-                "mobileDisclaimerCallToAction": "Select conversation"
+                "mobileDisclaimerCallToAction": "Select conversation",
+                "savedPosts": "Saved Messages",
+                "progress": "In Progress",
+                "completed": "Completed",
+                "archived": "Archived",
+                "emptySavedPosts": "There is nothing here yet. Bookmark messages and they will appear here.",
+                "deleteNoticeSavedPosts": "Archived and completed bookmarks will be removed after 100 days."
             },
             "post": {
                 "context": "Context",
@@ -134,7 +141,14 @@
                 "deleteMessage": "Delete message",
                 "replyMessage": "Reply in thread",
                 "deletedContent": "Post is being deleted in {{ progress }} second(s).",
-                "undoDelete": "Undo delete"
+                "undoDelete": "Undo delete",
+                "bookmarkPost": "Save post for later",
+                "removeBookmarkPost": "Remove bookmark",
+                "bookmarkPostProgress": "Save post as in progress",
+                "bookmarkPostArchived": "Archive saved post",
+                "bookmarkPostComplete": "Mark saved post as done",
+                "thread": "Thread",
+                "saved": "Saved for later"
             },
             "answerPost": {
                 "created": "New reply successfully created",
diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json
index 8506e7e5ed8b..eb79ff327373 100644
--- a/src/main/webapp/i18n/en/student-dashboard.json
+++ b/src/main/webapp/i18n/en/student-dashboard.json
@@ -67,6 +67,10 @@
                 "notFound": "No conversation found",
                 "favoriteChannels": "Favorites",
                 "hiddenChannels": "Hidden",
+                "savedPosts": "Saved Messages",
+                "progress": "In Progress",
+                "completed": "Completed",
+                "archived": "Archived",
                 "channels": "Channels",
                 "generalChannels": "General",
                 "exerciseChannels": "Exercises",
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/GroupChatIntegrationTest.java
index e349eda63b65..8f9e023fabf7 100644
--- a/src/test/java/de/tum/cit/aet/artemis/communication/GroupChatIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/GroupChatIntegrationTest.java
@@ -111,6 +111,7 @@ void postInGroupChat_firstPostReceivedByAllMembers() throws Exception {
         GroupChatDTO chat = createGroupChatWithStudent1To3();
         // when
         var post = this.postInConversation(chat.getId(), "student1");
+        post.setIsSaved(false);
         // then
         verify(websocketMessagingService, timeout(2000).times(3)).sendMessage(anyString(),
                 (Object) argThat(argument -> argument instanceof PostDTO postDTO && postDTO.post().equals(post)));
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java
index c3673c8a3dfd..554da34e0c7f 100644
--- a/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/PostingServiceUnitTest.java
@@ -11,6 +11,8 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.junit.jupiter.api.AfterEach;
@@ -20,8 +22,13 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import de.tum.cit.aet.artemis.communication.domain.AnswerPost;
+import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
 import de.tum.cit.aet.artemis.communication.service.ConversationMessagingService;
 import de.tum.cit.aet.artemis.communication.service.PostingService;
+import de.tum.cit.aet.artemis.communication.test_repository.SavedPostTestRepository;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
 import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
@@ -43,12 +50,51 @@ class PostingServiceUnitTest {
 
     private AutoCloseable closeable;
 
+    @Mock
+    private SavedPostTestRepository savedPostRepository;
+
+    private User testUser;
+
+    private Post testPost;
+
+    private SavedPost savedPost;
+
+    private SavedPost savedAnswer;
+
+    private SavedPost savedAnswer2;
+
     @BeforeEach
     void initTestCase() throws NoSuchMethodException {
         closeable = MockitoAnnotations.openMocks(this);
 
         parseUserMentions = PostingService.class.getDeclaredMethod("parseUserMentions", Course.class, String.class);
         parseUserMentions.setAccessible(true);
+
+        testUser = new User();
+        testUser.setId(1L);
+
+        testPost = new Post();
+        testPost.setId(2L);
+
+        AnswerPost testAnswer1 = new AnswerPost();
+        testAnswer1.setId(3L);
+
+        AnswerPost testAnswer2 = new AnswerPost();
+        testAnswer2.setId(4L);
+
+        Set<AnswerPost> answers = new HashSet<>();
+        answers.add(testAnswer1);
+        answers.add(testAnswer2);
+        testPost.setAnswers(answers);
+
+        savedPost = new SavedPost();
+        savedPost.setPostId(testPost.getId());
+        savedAnswer = new SavedPost();
+        savedAnswer.setPostId(testAnswer1.getId());
+        savedAnswer2 = new SavedPost();
+        savedAnswer2.setPostId(testAnswer2.getId());
+
+        when(userRepository.getUser()).thenReturn(testUser);
     }
 
     @AfterEach
@@ -172,6 +218,46 @@ void testParseUserMentionsMissingClosingTag() throws InvocationTargetException,
         parseUserMentions.invoke(postingService, course, content);
     }
 
+    @Test
+    void shouldSetCorrectFlagsWhenPostsAreSaved() {
+        when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(
+            testUser.getId(),
+            PostingType.POST
+        )).thenReturn(List.of(savedPost.getPostId()));
+
+        when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(
+            testUser.getId(),
+            PostingType.ANSWER
+        )).thenReturn(List.of(savedAnswer.getPostId(), savedAnswer2.getPostId()));
+
+        postingService.preparePostForBroadcast(testPost);
+
+        assertThat(testPost.getIsSaved()).isTrue();
+        testPost.getAnswers().forEach(answer ->
+            assertThat(answer.getIsSaved()).isTrue()
+        );
+    }
+
+    @Test
+    void shouldSetCorrectFlagsWhenPostsAreNotSaved() {
+        when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(
+            testUser.getId(),
+            PostingType.POST
+        )).thenReturn(List.of());
+
+        when(savedPostRepository.findSavedPostIdsByUserIdAndPostType(
+            testUser.getId(),
+            PostingType.ANSWER
+        )).thenReturn(List.of());
+
+        postingService.preparePostForBroadcast(testPost);
+
+        assertThat(testPost.getIsSaved()).isFalse();
+        testPost.getAnswers().forEach(answer ->
+            assertThat(answer.getIsSaved()).isFalse()
+        );
+    }
+
     /**
      * Creates a user with the provided name and login
      *
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/SavedPostResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/SavedPostResourceIntegrationTest.java
new file mode 100644
index 000000000000..f5870ba3b79d
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/SavedPostResourceIntegrationTest.java
@@ -0,0 +1,129 @@
+package de.tum.cit.aet.artemis.communication;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.domain.SavedPostStatus;
+import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
+import de.tum.cit.aet.artemis.communication.test_repository.SavedPostTestRepository;
+import de.tum.cit.aet.artemis.communication.util.ConversationFactory;
+import de.tum.cit.aet.artemis.core.domain.User;
+
+class SavedPostResourceIntegrationTest extends AbstractConversationTest {
+
+    private static final String TEST_PREFIX = "sptest";
+
+    @Autowired
+    private SavedPostTestRepository savedPostRepository;
+
+    private User testUser;
+
+    private Post testPost;
+
+    private Conversation conversation;
+
+    @BeforeEach
+    void setUp() {
+        testUser = userUtilService.createAndSaveUser(TEST_PREFIX + "student1");
+        testPost = ConversationFactory.createBasicPost(1, testUser);
+        conversation = ConversationFactory.generatePublicChannel(exampleCourse, "Test Channel", true);
+        conversationRepository.save(conversation);
+        testPost.setConversation(conversation);
+        testPost = conversationMessageRepository.save(testPost);
+
+        SavedPost savedPost = ConversationFactory.generateSavedPost(testUser, testPost, PostingType.POST, SavedPostStatus.IN_PROGRESS);
+        savedPostRepository.save(savedPost);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnPostsWhenGetSavedPostIsCalled() throws Exception {
+        request.performMvcRequest(MockMvcRequestBuilders.get("/api/saved-posts/" + exampleCourseId + "/" + SavedPostStatus.IN_PROGRESS.getDatabaseKey()))
+                .andExpect(MockMvcResultMatchers.status().isOk()).andExpect(jsonPath("$", hasSize(1))).andExpect(jsonPath("$[0].id").value(testPost.getId()));
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnBadRequestWhenWrongStatusIsSupplied() throws Exception {
+        request.performMvcRequest(MockMvcRequestBuilders.get("/api/saved-posts/" + exampleCourseId + "/" + 999)).andExpect(MockMvcResultMatchers.status().isBadRequest())
+                .andExpect(jsonPath("$.message").value("error.savedPostStatusDoesNotExist"));
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnCreatedWhenPostIsBookmarkedAndIsNotBookmarkedYet() throws Exception {
+        var newTestPost = ConversationFactory.createBasicPost(2, testUser);
+        newTestPost.setConversation(conversation);
+        conversationMessageRepository.save(newTestPost);
+
+        request.performMvcRequest(MockMvcRequestBuilders.post("/api/saved-posts/{postId}/{type}", newTestPost.getId(), PostingType.POST.getDatabaseKey()))
+                .andExpect(MockMvcResultMatchers.status().isCreated());
+
+        conversationMessageRepository.delete(newTestPost);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnBadRequestWhenWrongTypeIsSupplied() throws Exception {
+        request.performMvcRequest(MockMvcRequestBuilders.post("/api/saved-posts/{postId}/{type}", testPost.getId(), 999)).andExpect(MockMvcResultMatchers.status().isBadRequest())
+                .andExpect(jsonPath("$.message").value("error.savedPostTypeDoesNotExist"));
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnMaxPostReachedWhenSavingAndLimitIsReached() throws Exception {
+        int createEntries = 100;
+        List<SavedPost> savedPosts = new ArrayList<>();
+
+        for (int i = 0; i < createEntries; i++) {
+            SavedPost savedPost = ConversationFactory.generateSavedPost(testUser, testPost, PostingType.POST, SavedPostStatus.IN_PROGRESS);
+            savedPostRepository.save(savedPost);
+            savedPosts.add(savedPost);
+        }
+
+        request.performMvcRequest(MockMvcRequestBuilders.post("/api/saved-posts/{postId}/{type}", testPost.getId(), PostingType.POST.getDatabaseKey()))
+                .andExpect(MockMvcResultMatchers.status().isBadRequest()).andExpect(jsonPath("$.message").value("error.savedPostMaxReached"));
+
+        // Cleanup
+        savedPostRepository.deleteAll(savedPosts);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnOkWhenUpdatingProperStatus() throws Exception {
+        request.performMvcRequest(MockMvcRequestBuilders.put("/api/saved-posts/{postId}/{type}?status={status}", testPost.getId(), PostingType.POST.getDatabaseKey(),
+                SavedPostStatus.COMPLETED.getDatabaseKey())).andExpect(MockMvcResultMatchers.status().isOk());
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnBadRequestWhenUpdatingAndWrongStatusIsSupplied() throws Exception {
+        request.performMvcRequest(MockMvcRequestBuilders.put("/api/saved-posts/{postId}/{type}?status={status}", testPost.getId(), PostingType.POST.getDatabaseKey(), 999))
+                .andExpect(MockMvcResultMatchers.status().isBadRequest()).andExpect(jsonPath("$.message").value("error.savedPostStatusDoesNotExist"));
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void shouldReturnNoContentWhenDeletingSavedPost() throws Exception {
+        request.performMvcRequest(MockMvcRequestBuilders.delete("/api/saved-posts/{postId}/{type}", testPost.getId(), PostingType.POST.getDatabaseKey()))
+                .andExpect(MockMvcResultMatchers.status().isNoContent());
+    }
+
+    @Override
+    String getTestPrefix() {
+        return TEST_PREFIX;
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MailServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MailServiceTest.java
index b29c998d6ee7..3e2a4f102fb5 100644
--- a/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MailServiceTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MailServiceTest.java
@@ -31,6 +31,8 @@
 import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants;
 import de.tum.cit.aet.artemis.communication.service.notifications.MailSendingService;
 import de.tum.cit.aet.artemis.communication.service.notifications.MailService;
+import de.tum.cit.aet.artemis.communication.service.notifications.MarkdownCustomLinkRendererService;
+import de.tum.cit.aet.artemis.communication.service.notifications.MarkdownCustomReferenceRendererService;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
 import de.tum.cit.aet.artemis.core.service.TimeService;
@@ -115,7 +117,8 @@ void setUp() throws MalformedURLException, URISyntaxException {
 
         mailSendingService = new MailSendingService(jHipsterProperties, javaMailSender);
 
-        mailService = new MailService(messageSource, templateEngine, timeService, mailSendingService);
+        mailService = new MailService(messageSource, templateEngine, timeService, mailSendingService, new MarkdownCustomLinkRendererService(),
+                new MarkdownCustomReferenceRendererService());
         ReflectionTestUtils.setField(mailService, "artemisServerUrl", new URI("http://localhost:8080").toURL());
     }
 
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MarkdownCustomLinkRendererServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MarkdownCustomLinkRendererServiceTest.java
new file mode 100644
index 000000000000..5fc0cfc27f37
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MarkdownCustomLinkRendererServiceTest.java
@@ -0,0 +1,71 @@
+package de.tum.cit.aet.artemis.communication.notifications.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import de.tum.cit.aet.artemis.communication.service.notifications.MarkdownCustomLinkRendererService;
+
+class MarkdownCustomLinkRendererServiceTest {
+
+    private MarkdownCustomLinkRendererService markdownCustomLinkRendererService;
+
+    @BeforeEach
+    void setUp() throws MalformedURLException, URISyntaxException {
+        markdownCustomLinkRendererService = new MarkdownCustomLinkRendererService();
+
+        ReflectionTestUtils.setField(markdownCustomLinkRendererService, "artemisServerUrl", new URI("http://localhost:8080").toURL());
+    }
+
+    @Test
+    void shouldRenderProperlyWhenProgrammingTagIsSupplied() {
+        String input = "[programming]Example (/example)[/programming]";
+        String expected = "<a href=\"http://localhost:8080/example\">Example</a>";
+
+        String result = markdownCustomLinkRendererService.render(input);
+
+        assertThat(result).isEqualTo(expected);
+    }
+
+    @Test
+    void shouldRenderMultipleTagsWhenMultipleTagsAreSupplied() {
+        String input = "[programming]Code (/code)[/programming] and [quiz]Quiz (/quiz)[/quiz]";
+        String expected = "<a href=\"http://localhost:8080/code\">Code</a> and <a href=\"http://localhost:8080/quiz\">Quiz</a>";
+
+        String result = markdownCustomLinkRendererService.render(input);
+
+        assertThat(result).isEqualTo(expected);
+    }
+
+    @Test
+    void shouldNotRenderWhenUnsupportedTagsAreSupplied() {
+        String input = "[unsupported]Text (/unsupported)[/unsupported]";
+        String result = markdownCustomLinkRendererService.render(input);
+
+        // Unsupported tags should not be rendered, so the input remains unchanged.
+        assertThat(result).isEqualTo(input);
+    }
+
+    @Test
+    void shouldNotRenderWhenLinkIsOmitted() {
+        String input = "[programming]Example[/programming]";
+        String result = markdownCustomLinkRendererService.render(input);
+
+        // Invalid format should not be rendered, so the input remains unchanged.
+        assertThat(result).isEqualTo(input);
+    }
+
+    @Test
+    void shouldReturnEmptyOutputWhenSuppliedWithEmptyInput() {
+        String input = "";
+        String result = markdownCustomLinkRendererService.render(input);
+
+        assertThat(result).isEmpty();
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MarkdownCustomReferenceRendererServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MarkdownCustomReferenceRendererServiceTest.java
new file mode 100644
index 000000000000..9c7aef13b531
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/notifications/service/MarkdownCustomReferenceRendererServiceTest.java
@@ -0,0 +1,60 @@
+package de.tum.cit.aet.artemis.communication.notifications.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import de.tum.cit.aet.artemis.communication.service.notifications.MarkdownCustomReferenceRendererService;
+
+class MarkdownCustomReferenceRendererServiceTest {
+
+    private MarkdownCustomReferenceRendererService service;
+
+    @BeforeEach
+    void setUp() {
+        service = new MarkdownCustomReferenceRendererService();
+    }
+
+    @Test
+    void shouldRenderUserReferenceWhenValidUserTagProvided() {
+        String input = "[user]Max Muster(ga1234as)[/user]";
+        assertThat(service.render(input)).isEqualTo("@Max Muster");
+    }
+
+    @Test
+    void shouldRenderChannelReferenceWhenValidChannelTagProvided() {
+        String input = "[channel]General Channel(general)[/channel]";
+        assertThat(service.render(input)).isEqualTo("#General Channel");
+    }
+
+    @Test
+    void shouldRenderMultipleReferencesInSingleContent() {
+        String input = "[user]Max Muster(ga1234as)[/user] and [channel]General Channel(general)[/channel]";
+        assertThat(service.render(input)).isEqualTo("@Max Muster and #General Channel");
+    }
+
+    @Test
+    void shouldHandleEmptyContentWithoutError() {
+        String input = "";
+        assertThat(service.render(input)).isEmpty();
+    }
+
+    @Test
+    void shouldReturnOriginalContentWhenNoValidTagsFound() {
+        String input = "Normal text without tags";
+        assertThat(service.render(input)).isEqualTo(input);
+    }
+
+    @Test
+    void shouldRenderReferenceWithAdditionalTextBeforeAndAfter() {
+        String input = "Before [user]Max Muster(ga1234as)[/user] After";
+        assertThat(service.render(input)).isEqualTo("Before @Max Muster After");
+    }
+
+    @Test
+    void shouldHandleInvalidTagsGracefully() {
+        String input = "[invalid]Some Text(reference)[/invalid]";
+        assertThat(service.render(input)).isEqualTo(input);
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleServiceTest.java
new file mode 100644
index 000000000000..f7d6b1c5a132
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleServiceTest.java
@@ -0,0 +1,124 @@
+package de.tum.cit.aet.artemis.communication.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.test_repository.SavedPostTestRepository;
+
+@ExtendWith(MockitoExtension.class)
+class SavedPostScheduleServiceTest {
+
+    @Mock
+    private SavedPostTestRepository savedPostRepository;
+
+    private SavedPostScheduleService savedPostScheduleService;
+
+    @Captor
+    private ArgumentCaptor<List<SavedPost>> savedPostCaptor;
+
+    @BeforeEach
+    void setUp() {
+        savedPostScheduleService = new SavedPostScheduleService(savedPostRepository);
+    }
+
+    @Test
+    void shouldDeleteArchivedSavedPostsWhenDateExceedsCutoff() {
+        List<SavedPost> oldPosts = List.of(createSavedPost(1L, ZonedDateTime.now().minusDays(101)), createSavedPost(2L, ZonedDateTime.now().minusDays(102)));
+        when(savedPostRepository.findByCompletedAtBefore(any())).thenReturn(oldPosts);
+
+        savedPostScheduleService.cleanupArchivedSavedPosts();
+
+        verify(savedPostRepository).deleteAll(savedPostCaptor.capture());
+        List<SavedPost> deletedPosts = savedPostCaptor.getValue();
+        assertThat(deletedPosts).hasSize(2);
+        assertThat(deletedPosts).containsExactlyElementsOf(oldPosts);
+    }
+
+    @Test
+    void shouldNotDeleteAnythingWhenNoSavedPostsAreFound() {
+        when(savedPostRepository.findByCompletedAtBefore(any())).thenReturn(new ArrayList<>());
+
+        savedPostScheduleService.cleanupArchivedSavedPosts();
+
+        verify(savedPostRepository, never()).deleteAll(any());
+    }
+
+    @Test
+    void shouldDeleteSavedPostsWhenTheyAreOrphaned() {
+        // Arrange
+        List<SavedPost> orphanedPosts = List.of(createSavedPost(1L, PostingType.POST), createSavedPost(2L, PostingType.POST));
+        when(savedPostRepository.findOrphanedPostReferences()).thenReturn(orphanedPosts);
+
+        // Act
+        savedPostScheduleService.cleanupOrphanedSavedPosts();
+
+        // Assert
+        verify(savedPostRepository).deleteAll(savedPostCaptor.capture());
+        List<SavedPost> deletedPosts = savedPostCaptor.getValue();
+        assertThat(deletedPosts).hasSize(2);
+        assertThat(deletedPosts).containsExactlyElementsOf(orphanedPosts);
+    }
+
+    @Test
+    void shouldNotDeleteAnythingWhenNoOrphanedPostsAreFound() {
+        when(savedPostRepository.findOrphanedPostReferences()).thenReturn(new ArrayList<>());
+
+        savedPostScheduleService.cleanupOrphanedSavedPosts();
+
+        verify(savedPostRepository, never()).deleteAll(any());
+    }
+
+    @Test
+    void shouldDeleteSavedAnswerPostsWhenTheyAreOrphaned() {
+        List<SavedPost> orphanedAnswers = List.of(createSavedPost(1L, PostingType.ANSWER), createSavedPost(2L, PostingType.ANSWER));
+        when(savedPostRepository.findOrphanedAnswerReferences()).thenReturn(orphanedAnswers);
+
+        savedPostScheduleService.cleanupOrphanedSavedAnswerPosts();
+
+        verify(savedPostRepository).deleteAll(savedPostCaptor.capture());
+        List<SavedPost> deletedPosts = savedPostCaptor.getValue();
+        assertThat(deletedPosts).hasSize(2);
+        assertThat(deletedPosts).containsExactlyElementsOf(orphanedAnswers);
+    }
+
+    @Test
+    void shouldNotDeleteAnythingWhenNoOrphanedAnswerPostsAreFound() {
+        when(savedPostRepository.findOrphanedAnswerReferences()).thenReturn(new ArrayList<>());
+
+        savedPostScheduleService.cleanupOrphanedSavedAnswerPosts();
+
+        verify(savedPostRepository, never()).deleteAll(any());
+    }
+
+    private SavedPost createSavedPost(Long id, ZonedDateTime completedAt) {
+        SavedPost savedPost = new SavedPost();
+        savedPost.setId(id);
+        savedPost.setCompletedAt(completedAt);
+        return savedPost;
+    }
+
+    private SavedPost createSavedPost(Long id, PostingType postType) {
+        SavedPost savedPost = new SavedPost();
+        savedPost.setId(id);
+        savedPost.setPostType(postType);
+        savedPost.setCompletedAt(ZonedDateTime.now());
+        return savedPost;
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java
new file mode 100644
index 000000000000..19db6d11d46b
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/service/SavedPostServiceTest.java
@@ -0,0 +1,164 @@
+package de.tum.cit.aet.artemis.communication.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.domain.SavedPostStatus;
+import de.tum.cit.aet.artemis.communication.test_repository.SavedPostTestRepository;
+import de.tum.cit.aet.artemis.core.domain.User;
+import de.tum.cit.aet.artemis.core.test_repository.UserTestRepository;
+
+@ExtendWith(MockitoExtension.class)
+class SavedPostServiceTest {
+
+    private SavedPostService savedPostService;
+
+    @Mock
+    private SavedPostTestRepository savedPostRepository;
+
+    @Mock
+    private UserTestRepository userRepository;
+
+    private User testUser;
+
+    private Post testPost;
+
+    private SavedPost testSavedPost;
+
+    @BeforeEach
+    void setUp() {
+        savedPostService = new SavedPostService(savedPostRepository, userRepository);
+
+        testUser = new User();
+        testUser.setId(1L);
+
+        testPost = new Post();
+        testPost.setId(1L);
+
+        testSavedPost = new SavedPost(testUser, testPost.getId(), PostingType.POST, SavedPostStatus.IN_PROGRESS, null);
+
+        when(userRepository.getUser()).thenReturn(testUser);
+    }
+
+    @Test
+    void shouldSavePostSuccessfullyWhenPostIsNotSavedYet() {
+        when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(
+            testUser.getId(),
+            testPost.getId(),
+            PostingType.POST
+        )).thenReturn(null);
+
+        savedPostService.savePostForCurrentUser(testPost);
+
+        verify(savedPostRepository).save(any(SavedPost.class));
+    }
+
+    @Test
+    void shouldNotSavePostWhenPostIsSavedAlready() {
+        when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(
+            testUser.getId(),
+            testPost.getId(),
+            PostingType.POST
+        )).thenReturn(testSavedPost);
+
+        savedPostService.savePostForCurrentUser(testPost);
+
+        verify(savedPostRepository, never()).save(any());
+    }
+
+    @Test
+    void shouldRemoveSavedPostWhenPostIsBookmarked() {
+        when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(
+            testUser.getId(),
+            testPost.getId(),
+            PostingType.POST
+        )).thenReturn(testSavedPost);
+
+        savedPostService.removeSavedPostForCurrentUser(testPost);
+
+        verify(savedPostRepository).delete(testSavedPost);
+    }
+
+    @Test
+    void shouldNotRemoveSavedPostWhenPostIsNotBookmarked() {
+        when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(
+            testUser.getId(),
+            testPost.getId(),
+            PostingType.POST
+        )).thenReturn(null);
+
+        savedPostService.removeSavedPostForCurrentUser(testPost);
+
+        verify(savedPostRepository, never()).delete(any());
+    }
+
+    @Test
+    void shouldUpdateStatusAndCompletedAtOfSavedPostWhenPostIsInProgress() {
+        when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(
+            testUser.getId(),
+            testPost.getId(),
+            PostingType.POST
+        )).thenReturn(testSavedPost);
+
+        savedPostService.updateStatusOfSavedPostForCurrentUser(testPost, SavedPostStatus.COMPLETED);
+
+        assertThat(testSavedPost.getStatus()).isEqualTo(SavedPostStatus.COMPLETED);
+        assertThat(testSavedPost.getCompletedAt()).isNotNull();
+        verify(savedPostRepository).save(testSavedPost);
+    }
+
+    @Test
+    void shouldUpdateStatusAndResetCompletedAtOfSavedPostWhenPostIsSetToInProgress() {
+        testSavedPost.setCompletedAt(ZonedDateTime.now());
+        when(savedPostRepository.findSavedPostByUserIdAndPostIdAndPostType(testUser.getId(), testPost.getId(), PostingType.POST)).thenReturn(testSavedPost);
+
+        savedPostService.updateStatusOfSavedPostForCurrentUser(testPost, SavedPostStatus.IN_PROGRESS);
+
+        assertThat(testSavedPost.getStatus()).isEqualTo(SavedPostStatus.IN_PROGRESS);
+        assertThat(testSavedPost.getCompletedAt()).isNull();
+        verify(savedPostRepository).save(testSavedPost);
+    }
+
+    @Test
+    void shouldReturnListFromRepositoryWhenQueriedByCurrentUser() {
+        SavedPostStatus status = SavedPostStatus.IN_PROGRESS;
+        when(savedPostRepository.findSavedPostsByUserIdAndStatusOrderByCompletedAtDescIdDesc(testUser.getId(), status)).thenReturn(List.of(testSavedPost));
+
+        List<SavedPost> result = savedPostService.getSavedPostsForCurrentUserByStatus(status);
+
+        assertThat(result).containsExactly(testSavedPost);
+    }
+
+    @Test
+    void shouldReturnLimitExceededWhenUserHasToManySavedPosts() {
+        when(savedPostRepository.countByUserId(testUser.getId())).thenReturn(100L);
+
+        boolean result = savedPostService.isMaximumSavedPostsReached();
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    void shouldReturnLimitNotExceededWhenUserIsBelowThreshold() {
+        when(savedPostRepository.countByUserId(testUser.getId())).thenReturn(99L);
+
+        boolean result = savedPostService.isMaximumSavedPostsReached();
+
+        assertThat(result).isFalse();
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/test_repository/SavedPostTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/communication/test_repository/SavedPostTestRepository.java
new file mode 100644
index 000000000000..8bad5d020cf1
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/test_repository/SavedPostTestRepository.java
@@ -0,0 +1,11 @@
+package de.tum.cit.aet.artemis.communication.test_repository;
+
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Repository;
+
+import de.tum.cit.aet.artemis.communication.repository.SavedPostRepository;
+
+@Repository
+@Primary
+public interface SavedPostTestRepository extends SavedPostRepository {
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationFactory.java b/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationFactory.java
index 4409086389c2..5b4357c7e328 100644
--- a/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationFactory.java
+++ b/src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationFactory.java
@@ -7,7 +7,11 @@
 
 import de.tum.cit.aet.artemis.communication.domain.DisplayPriority;
 import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.Posting;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
 import de.tum.cit.aet.artemis.communication.domain.Reaction;
+import de.tum.cit.aet.artemis.communication.domain.SavedPost;
+import de.tum.cit.aet.artemis.communication.domain.SavedPostStatus;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Channel;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
@@ -110,4 +114,17 @@ public static Channel generatePublicChannel(Course course, String channelName, b
         channel.setDescription("Test channel");
         return channel;
     }
+
+    /**
+     * Generates a SavedPost for a given user, posting, posting type and saved post status.
+     *
+     * @param user            User that bookmarked post
+     * @param posting         Posting to bookmark
+     * @param postingType     Type of posting
+     * @param savedPostStatus status of posting
+     * @return The generated SavedPost
+     */
+    public static SavedPost generateSavedPost(User user, Posting posting, PostingType postingType, SavedPostStatus savedPostStatus) {
+        return new SavedPost(user, posting.getId(), postingType, savedPostStatus, ZonedDateTime.now());
+    }
 }
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/StaticCodeAnalysisParserUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/StaticCodeAnalysisParserUnitTest.java
index 2e8886ec0fbc..946900357324 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/StaticCodeAnalysisParserUnitTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/StaticCodeAnalysisParserUnitTest.java
@@ -2,21 +2,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO;
 import de.tum.cit.aet.artemis.programming.service.localci.scaparser.ReportParser;
-import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.ParserException;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException;
 
 /**
  * Tests each parser with an example file
@@ -27,92 +26,61 @@ class StaticCodeAnalysisParserUnitTest {
 
     private static final Path REPORTS_FOLDER_PATH = Paths.get("src", "test", "resources", "test-data", "static-code-analysis", "reports");
 
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    private void testParserWithFile(String toolGeneratedReportFileName, String expectedJSONReportFileName) throws IOException {
+        testParserWithFileNamed(toolGeneratedReportFileName, toolGeneratedReportFileName, expectedJSONReportFileName);
+    }
+
     /**
      * Compares the parsed JSON report with the expected JSON report
      *
      * @param toolGeneratedReportFileName The name of the file contains the report as generated by the different tools
      * @param expectedJSONReportFileName  The name of the file that contains the parsed report
-     * @throws ParserException If an exception occurs that is not already handled by the parser itself, e.g. caused by the json-parsing
      */
-    private void testParserWithFile(String toolGeneratedReportFileName, String expectedJSONReportFileName) throws ParserException, IOException {
-        File toolReport = REPORTS_FOLDER_PATH.resolve(toolGeneratedReportFileName).toFile();
+    private void testParserWithFileNamed(String toolGeneratedReportFileName, String fileName, String expectedJSONReportFileName) throws IOException {
+        Path actualReportPath = REPORTS_FOLDER_PATH.resolve(toolGeneratedReportFileName);
+        File expectedJSONReportFile = EXPECTED_FOLDER_PATH.resolve(expectedJSONReportFileName).toFile();
 
-        ReportParser parser = new ReportParser();
-        String actual = parser.transformToJSONReport(toolReport);
-
-        try (BufferedReader reader = Files.newBufferedReader(EXPECTED_FOLDER_PATH.resolve(expectedJSONReportFileName))) {
-            String expected = reader.lines().collect(Collectors.joining(System.lineSeparator()));
-            assertThat(actual).isEqualTo(expected);
-        }
+        String actualReportContent = Files.readString(actualReportPath);
+        testParserWithContent(actualReportContent, fileName, expectedJSONReportFile);
     }
 
-    private void testParserWithNullValue() throws ParserException {
-        ReportParser parser = new ReportParser();
-        parser.transformToJSONReport(null);
+    private void testParserWithContent(String actualReportContent, String actualReportFilename, File expectedJSONReportFile) throws IOException {
+        StaticCodeAnalysisReportDTO actualReport = ReportParser.getReport(actualReportContent, actualReportFilename);
+
+        StaticCodeAnalysisReportDTO expectedReport = mapper.readValue(expectedJSONReportFile, StaticCodeAnalysisReportDTO.class);
+
+        assertThat(actualReport).isEqualTo(expectedReport);
     }
 
     @Test
     void testCheckstyleParser() throws IOException {
-        try {
-            testParserWithFile("checkstyle-result.xml", "checkstyle.txt");
-        }
-        catch (ParserException e) {
-            fail("Checkstyle parser failed with exception: " + e.getMessage());
-        }
+        testParserWithFile("checkstyle-result.xml", "checkstyle.txt");
     }
 
     @Test
     void testPMDCPDParser() throws IOException {
-        try {
-            testParserWithFile("cpd.xml", "pmd_cpd.txt");
-        }
-        catch (ParserException e) {
-            fail("PMD-CPD parser failed with exception: " + e.getMessage());
-        }
+        testParserWithFile("cpd.xml", "pmd_cpd.txt");
     }
 
     @Test
     void testPMDParser() throws IOException {
-        try {
-            testParserWithFile("pmd.xml", "pmd.txt");
-        }
-        catch (ParserException e) {
-            fail("PMD parser failed with exception: " + e.getMessage());
-        }
+        testParserWithFile("pmd.xml", "pmd.txt");
     }
 
     @Test
     void testSpotbugsParser() throws IOException {
-        try {
-            testParserWithFile("spotbugsXml.xml", "spotbugs.txt");
-        }
-        catch (ParserException e) {
-            fail("Spotbugs parser failed with exception: " + e.getMessage());
-        }
+        testParserWithFile("spotbugsXml.xml", "spotbugs.txt");
     }
 
     @Test
-    void testParseInvalidFilename() {
-        assertThatCode(() -> testParserWithFile("cpd_invalid.txt", "invalid_filename.txt")).isInstanceOf(ParserException.class);
-    }
-
-    @Test
-    void testParseInvalidXML() throws Exception {
-        testParserWithFile("invalid_xml.xml", "invalid_xml.txt");
+    void testParseInvalidXML() throws IOException {
+        assertThatCode(() -> testParserWithFileNamed("invalid_xml.xml", "pmd.xml", "invalid_xml.txt")).isInstanceOf(RuntimeException.class);
     }
 
     @Test
     void testInvalidName() throws IOException {
-        try {
-            testParserWithFile("invalid_name.xml", "invalid_name.txt");
-        }
-        catch (ParserException e) {
-            fail("Parser failed with exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void testThrowsParserException() {
-        assertThatExceptionOfType(ParserException.class).isThrownBy(this::testParserWithNullValue);
+        assertThatCode(() -> testParserWithFile("invalid_name.xml", "invalid_name.txt")).isInstanceOf(UnsupportedToolException.class);
     }
 }
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java
index 28a919289e61..9d02a9f4dcaf 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java
@@ -364,10 +364,29 @@ void testPauseBuildAgent() throws Exception {
         // We need to clear the processing jobs to avoid the agent being set to ACTIVE again
         processingJobs.clear();
 
-        request.put("/api/admin/agent/" + URLEncoder.encode(agent1.buildAgent().name(), StandardCharsets.UTF_8) + "/pause", null, HttpStatus.NO_CONTENT);
+        request.put("/api/admin/agents/" + URLEncoder.encode(agent1.buildAgent().name(), StandardCharsets.UTF_8) + "/pause", null, HttpStatus.NO_CONTENT);
         await().until(() -> buildAgentInformation.get(agent1.buildAgent().memberAddress()).status() == BuildAgentInformation.BuildAgentStatus.PAUSED);
 
-        request.put("/api/admin/agent/" + URLEncoder.encode(agent1.buildAgent().name(), StandardCharsets.UTF_8) + "/resume", null, HttpStatus.NO_CONTENT);
+        request.put("/api/admin/agents/" + URLEncoder.encode(agent1.buildAgent().name(), StandardCharsets.UTF_8) + "/resume", null, HttpStatus.NO_CONTENT);
         await().until(() -> buildAgentInformation.get(agent1.buildAgent().memberAddress()).status() == BuildAgentInformation.BuildAgentStatus.IDLE);
     }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN")
+    void testPauseAllBuildAgents() throws Exception {
+        // We need to clear the processing jobs to avoid the agent being set to ACTIVE again
+        processingJobs.clear();
+
+        request.put("/api/admin/agents/pause-all", null, HttpStatus.NO_CONTENT);
+        await().until(() -> {
+            var agents = buildAgentInformation.values();
+            return agents.stream().allMatch(agent -> agent.status() == BuildAgentInformation.BuildAgentStatus.PAUSED);
+        });
+
+        request.put("/api/admin/agents/resume-all", null, HttpStatus.NO_CONTENT);
+        await().until(() -> {
+            var agents = buildAgentInformation.values();
+            return agents.stream().allMatch(agent -> agent.status() == BuildAgentInformation.BuildAgentStatus.IDLE);
+        });
+    }
 }
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/SarifParserTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/SarifParserTest.java
new file mode 100644
index 000000000000..a84df20165d7
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/sarif/SarifParserTest.java
@@ -0,0 +1,476 @@
+package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.sarif;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool;
+import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue;
+import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO;
+import de.tum.cit.aet.artemis.programming.service.localci.scaparser.format.sarif.ReportingDescriptor;
+
+class SarifParserTest {
+
+    static class FullDescriptionCategorizer implements RuleCategorizer {
+
+        @Override
+        public String categorizeRule(ReportingDescriptor rule) {
+            return rule.getOptionalFullDescription().orElseThrow().text();
+        }
+    }
+
+    @Test
+    void testEmpty() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {
+                                    "rules": []
+                                }
+                            },
+                            "results": []
+                        }
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new IdCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).isEmpty();
+    }
+
+    @Test
+    void testMetadata() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {
+                                    "rules": [
+                                        {
+                                            "fullDescription": {
+                                                "text": "CATEGORY"
+                                            },
+                                            "id": "RULE_ID"
+                                        }
+                                    ]
+                                }
+                            },
+                            "results": [
+                                {
+                                    "level": "error",
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 10,
+                                                    "startColumn": 20,
+                                                    "endLine": 30,
+                                                    "endColumn": 40
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "MESSAGE"
+                                    },
+                                    "ruleId": "RULE_ID",
+                                    "ruleIndex": 0
+                                }
+                            ]
+                        }
+                    ]
+                }
+                """;
+        StaticCodeAnalysisIssue expected = new StaticCodeAnalysisIssue("/path/to/file.txt", 10, 30, 20, 40, "RULE_ID", "CATEGORY", "MESSAGE", "error", null);
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new FullDescriptionCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).singleElement().isEqualTo(expected);
+    }
+
+    @Test
+    void testMessageLookup() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {
+                                    "rules": [
+                                        {
+                                            "fullDescription": {
+                                                "text": "FULL_DESCRIPTION"
+                                            },
+                                            "id": "A001",
+                                            "messageStrings": {
+                                                "MESSAGE_ID_A": {
+                                                    "text": "RULE_MESSAGE_CONTENT_A"
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "globalMessageStrings": {
+                                        "MESSAGE_ID_A": {
+                                            "text": "GLOBAL_MESSAGE_CONTENT_A"
+                                        },
+                                        "MESSAGE_ID_B": {
+                                            "text": "GLOBAL_MESSAGE_CONTENT_B"
+                                        }
+                                    }
+                                }
+                            },
+                            "results": [
+                                {
+                                    "level": "error",
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "id": "MESSAGE_ID_A"
+                                    },
+                                    "ruleId": "A001",
+                                    "ruleIndex": 0
+                                },
+                                {
+                                    "level": "error",
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "id": "MESSAGE_ID_B"
+                                    },
+                                    "ruleId": "B001"
+                                }
+                            ]
+                        }
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new IdCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).anyMatch(issue -> issue.rule().equals("A001") && issue.message().equals("RULE_MESSAGE_CONTENT_A"))
+                .anyMatch(issue -> issue.rule().equals("B001") && issue.message().equals("GLOBAL_MESSAGE_CONTENT_B"));
+    }
+
+    @Test
+    void testHierarchicalRuleIdLookup() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {
+                                    "rules": [
+                                        {
+                                            "fullDescription": {
+                                                "text": "FULL_DESCRIPTION"
+                                            },
+                                            "id": "A123"
+                                        }
+                                    ]
+                                }
+                            },
+                            "results": [
+                                {
+                                    "level": "error",
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "MESSAGE"
+                                    },
+                                    "ruleId": "A123/subrule"
+                                }
+                            ]
+                        }
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new FullDescriptionCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).singleElement().matches(issue -> issue.category().equals("FULL_DESCRIPTION"));
+    }
+
+    @Test
+    void testRuleIndexLookup() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {
+                                    "rules": [
+                                        {
+                                            "fullDescription": {
+                                                "text": "FULL_DESCRIPTION_A"
+                                            },
+                                            "id": "RULE_ID"
+                                        },
+                                        {
+                                            "fullDescription": {
+                                                "text": "FULL_DESCRIPTION_B"
+                                            },
+                                            "id": "RULE_ID"
+                                        }
+                                    ]
+                                }
+                            },
+                            "results": [
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "MESSAGE"
+                                    },
+                                    "ruleId": "RULE_ID",
+                                    "ruleIndex": 1
+                                }
+                            ]
+                        }
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new FullDescriptionCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).singleElement().matches(issue -> issue.category().equals("FULL_DESCRIPTION_B"));
+    }
+
+    @Test
+    void testInvalidJSON() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new IdCategorizer());
+        assertThatThrownBy(() -> parser.parse(report)).hasCauseInstanceOf(JsonProcessingException.class);
+    }
+
+    @Test
+    void testFilterMalformedSarif() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {}
+                            },
+                            "results": [
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "VALID"
+                                    },
+                                    "ruleId": "A001"
+                                },
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "REGION MISSING"
+                                    },
+                                    "ruleId": "A002"
+                                },
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "NO_RULE_ID"
+                                    }
+                                },
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "id": "INVALID_MESSAGE_ID"
+                                    },
+                                    "ruleId": "A004"
+                                }
+                            ]
+                        }
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new IdCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).singleElement().matches(issue -> issue.rule().equals("A001"));
+    }
+
+    @Test
+    void testFilterInformationMissing() {
+        String report = """
+                {
+                    "runs": [
+                        {
+                            "tool": {
+                                "driver": {}
+                            },
+                            "results": [
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "VALID"
+                                    },
+                                    "ruleId": "A001"
+                                },
+                                {
+                                    "message": {
+                                        "text": "LOCATION MISSING"
+                                    },
+                                    "ruleId": "A002"
+                                },
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "region": {
+                                                    "startLine": 1
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "PATH MISSING"
+                                    },
+                                    "ruleId": "A003"
+                                },
+                                {
+                                    "locations": [
+                                        {
+                                            "physicalLocation": {
+                                                "artifactLocation": {
+                                                    "uri": "file:///path/to/file.txt"
+                                                },
+                                                "region": {
+                                                    "byteOffset": 0,
+                                                    "byteLength": 10
+                                                }
+                                            }
+                                        }
+                                    ],
+                                    "message": {
+                                        "text": "NOT A TEXT REGION"
+                                    },
+                                    "ruleId": "A004"
+                                }
+                            ]
+                        }
+                    ]
+                }
+                """;
+
+        SarifParser parser = new SarifParser(StaticCodeAnalysisTool.OTHER, new IdCategorizer());
+        StaticCodeAnalysisReportDTO parsedReport = parser.parse(report);
+
+        assertThat(parsedReport.issues()).singleElement().matches(issue -> issue.rule().equals("A001"));
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseFactory.java
index e4dca9d8be57..bf4c207df1e6 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseFactory.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseFactory.java
@@ -341,6 +341,7 @@ private static StaticCodeAnalysisIssue generateStaticCodeAnalysisIssue(StaticCod
             case PMD_CPD -> "Copy/Paste Detection";
             case SWIFTLINT -> "swiftLint"; // TODO: rene: set better value after categories are better defined
             case GCC -> "Memory";
+            case OTHER -> "Other";
         };
 
         return new StaticCodeAnalysisIssue(Constants.STUDENT_WORKING_DIRECTORY + "/www/packagename/Class1.java", // filePath
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts
index fe898f69474a..f71ad2c8d920 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts
@@ -2,18 +2,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { BuildAgentSummaryComponent } from 'app/localci/build-agents/build-agent-summary/build-agent-summary.component';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
-import { of } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { BuildJob } from 'app/entities/programming/build-job.model';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../../test.module';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { DataTableComponent } from 'app/shared/data-table/data-table.component';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { NgxDatatableModule } from '@siemens/ngx-datatable';
 import { BuildAgentInformation, BuildAgentStatus } from '../../../../../../main/webapp/app/entities/programming/build-agent-information.model';
 import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
 import { BuildConfig } from 'app/entities/programming/build-config.model';
+import { AlertService, AlertType } from '../../../../../../main/webapp/app/core/util/alert.service';
 
 describe('BuildAgentSummaryComponent', () => {
     let component: BuildAgentSummaryComponent;
@@ -27,6 +28,8 @@ describe('BuildAgentSummaryComponent', () => {
 
     const mockBuildAgentsService = {
         getBuildAgentSummary: jest.fn().mockReturnValue(of([])),
+        pauseAllBuildAgents: jest.fn().mockReturnValue(of({})),
+        resumeAllBuildAgents: jest.fn().mockReturnValue(of({})),
     };
 
     const repositoryInfo: RepositoryInfo = {
@@ -135,6 +138,8 @@ describe('BuildAgentSummaryComponent', () => {
             status: BuildAgentStatus.ACTIVE,
         },
     ];
+    let alertService: AlertService;
+    let alertServiceAddAlertStub: jest.SpyInstance;
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
@@ -144,11 +149,14 @@ describe('BuildAgentSummaryComponent', () => {
                 { provide: JhiWebsocketService, useValue: mockWebsocketService },
                 { provide: BuildAgentsService, useValue: mockBuildAgentsService },
                 { provide: DataTableComponent, useClass: DataTableComponent },
+                MockProvider(AlertService),
             ],
         }).compileComponents();
 
         fixture = TestBed.createComponent(BuildAgentSummaryComponent);
         component = fixture.componentInstance;
+        alertService = TestBed.inject(AlertService);
+        alertServiceAddAlertStub = jest.spyOn(alertService, 'addAlert');
     }));
 
     beforeEach(() => {
@@ -218,4 +226,36 @@ describe('BuildAgentSummaryComponent', () => {
         expect(component.buildCapacity).toBe(0);
         expect(component.currentBuilds).toBe(0);
     });
+
+    it('should call correct service method when pausing and resuming build agents', () => {
+        component.pauseAllBuildAgents();
+        expect(alertServiceAddAlertStub).toHaveBeenCalledWith({
+            type: AlertType.SUCCESS,
+            message: 'artemisApp.buildAgents.alerts.buildAgentsPaused',
+        });
+
+        component.resumeAllBuildAgents();
+        expect(alertServiceAddAlertStub).toHaveBeenCalledWith({
+            type: AlertType.SUCCESS,
+            message: 'artemisApp.buildAgents.alerts.buildAgentsResumed',
+        });
+    });
+
+    it('should show alert when error in pausing or resuming build agents', () => {
+        mockBuildAgentsService.pauseAllBuildAgents.mockReturnValue(throwError(() => new Error()));
+
+        component.pauseAllBuildAgents();
+        expect(alertServiceAddAlertStub).toHaveBeenCalledWith({
+            type: AlertType.DANGER,
+            message: 'artemisApp.buildAgents.alerts.buildAgentPauseFailed',
+        });
+
+        mockBuildAgentsService.resumeAllBuildAgents.mockReturnValue(throwError(() => new Error()));
+
+        component.resumeAllBuildAgents();
+        expect(alertServiceAddAlertStub).toHaveBeenCalledWith({
+            type: AlertType.DANGER,
+            message: 'artemisApp.buildAgents.alerts.buildAgentResumeFailed',
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
index 261acf610ff2..18b9f0135b83 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
@@ -134,7 +134,7 @@ describe('BuildAgentsService', () => {
     it('should pause build agent', () => {
         service.pauseBuildAgent('buildAgent1').subscribe();
 
-        const req = httpMock.expectOne(`${service.adminResourceUrl}/agent/buildAgent1/pause`);
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/buildAgent1/pause`);
         expect(req.request.method).toBe('PUT');
         req.flush({});
     });
@@ -142,7 +142,23 @@ describe('BuildAgentsService', () => {
     it('should resume build agent', () => {
         service.resumeBuildAgent('buildAgent1').subscribe();
 
-        const req = httpMock.expectOne(`${service.adminResourceUrl}/agent/buildAgent1/resume`);
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/buildAgent1/resume`);
+        expect(req.request.method).toBe('PUT');
+        req.flush({});
+    });
+
+    it('should pause all build agents', () => {
+        service.pauseAllBuildAgents().subscribe();
+
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/pause-all`);
+        expect(req.request.method).toBe('PUT');
+        req.flush({});
+    });
+
+    it('should resume all build agents', () => {
+        service.resumeAllBuildAgents().subscribe();
+
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/resume-all`);
         expect(req.request.method).toBe('PUT');
         req.flush({});
     });
@@ -152,7 +168,7 @@ describe('BuildAgentsService', () => {
 
         const observable = lastValueFrom(service.pauseBuildAgent('buildAgent1'));
 
-        const req = httpMock.expectOne(`${service.adminResourceUrl}/agent/buildAgent1/pause`);
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/buildAgent1/pause`);
         expect(req.request.method).toBe('PUT');
         req.flush({ message: errorMessage }, { status: 500, statusText: 'Internal Server Error' });
 
@@ -170,7 +186,42 @@ describe('BuildAgentsService', () => {
         const observable = lastValueFrom(service.resumeBuildAgent('buildAgent1'));
 
         // Set up the expected HTTP request and flush the response with an error.
-        const req = httpMock.expectOne(`${service.adminResourceUrl}/agent/buildAgent1/resume`);
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/buildAgent1/resume`);
+        expect(req.request.method).toBe('PUT');
+        req.flush({ message: errorMessage }, { status: 500, statusText: 'Internal Server Error' });
+
+        try {
+            await observable;
+            throw new Error('expected an error, but got a success');
+        } catch (error) {
+            expect(error.message).toContain(errorMessage);
+        }
+    });
+
+    it('should handle pause all build agents error', async () => {
+        const errorMessage = 'Failed to pause build agents';
+
+        const observable = lastValueFrom(service.pauseAllBuildAgents());
+
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/pause-all`);
+        expect(req.request.method).toBe('PUT');
+        req.flush({ message: errorMessage }, { status: 500, statusText: 'Internal Server Error' });
+
+        try {
+            await observable;
+            throw new Error('expected an error, but got a success');
+        } catch (error) {
+            expect(error.message).toContain(errorMessage);
+        }
+    });
+
+    it('should handle resume all build agents error', async () => {
+        const errorMessage = 'Failed to resume build agents';
+
+        const observable = lastValueFrom(service.resumeAllBuildAgents());
+
+        // Set up the expected HTTP request and flush the response with an error.
+        const req = httpMock.expectOne(`${service.adminResourceUrl}/agents/resume-all`);
         expect(req.request.method).toBe('PUT');
         req.flush({ message: errorMessage }, { status: 500, statusText: 'Internal Server Error' });
 
diff --git a/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts
index 40b91216fea7..825d153b7af7 100644
--- a/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-conversations/course-conversations.component.spec.ts
@@ -10,7 +10,7 @@ import { CourseWideSearchComponent } from 'app/overview/course-conversations/cou
 import { ConversationMessagesComponent } from 'app/overview/course-conversations/layout/conversation-messages/conversation-messages.component';
 import { ConversationThreadSidebarComponent } from 'app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component';
 import { Course } from 'app/entities/course.model';
-import { BehaviorSubject, EMPTY } from 'rxjs';
+import { BehaviorSubject, EMPTY, of } from 'rxjs';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Params, Router, convertToParamMap } from '@angular/router';
 import { MockRouter } from '../../../helpers/mocks/mock-router';
@@ -42,6 +42,7 @@ import { ChannelsCreateDialogComponent } from 'app/overview/course-conversations
 import { ChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { LayoutService } from 'app/shared/breakpoints/layout.service';
 import { CustomBreakpointNames } from 'app/shared/breakpoints/breakpoints.service';
+import { Posting, PostingType, SavedPostStatus, SavedPostStatusMap } from 'app/entities/metis/posting.model';
 
 const examples: (ConversationDTO | undefined)[] = [undefined, generateOneToOneChatDTO({}), generateExampleGroupChatDTO({}), generateExampleChannelDTO({})];
 
@@ -59,6 +60,7 @@ examples.forEach((activeConversation) => {
         let modalService: NgbModal;
         let courseSidebarService: CourseSidebarService;
         let layoutService: LayoutService;
+        let activatedRoute: ActivatedRoute;
 
         const MockLayoutService = {
             activeBreakpoints: [],
@@ -130,6 +132,7 @@ examples.forEach((activeConversation) => {
             metisConversationService = TestBed.inject(MetisConversationService);
             courseSidebarService = TestBed.inject(CourseSidebarService);
             layoutService = TestBed.inject(LayoutService);
+            activatedRoute = TestBed.inject(ActivatedRoute);
 
             Object.defineProperty(metisConversationService, 'isServiceSetup$', { get: () => new BehaviorSubject(true).asObservable() });
             Object.defineProperty(metisConversationService, 'conversationsOfUser$', { get: () => new BehaviorSubject([new GroupChatDTO()]).asObservable() });
@@ -431,5 +434,174 @@ examples.forEach((activeConversation) => {
                 expect(prepareSidebarDataSpy).not.toHaveBeenCalled();
             });
         });
+
+        describe('query parameter handling', () => {
+            it('should handle SavedPostStatus in conversationId', () => {
+                const queryParams = {
+                    conversationId: SavedPostStatusMap.ARCHIVED.toString(),
+                };
+                activatedRoute.queryParams = of(queryParams);
+
+                component.subscribeToQueryParameter();
+
+                expect(component['selectedSavedPostStatus']).toBe(SavedPostStatus.ARCHIVED);
+                expect(setActiveConversationSpy).not.toHaveBeenCalled();
+            });
+
+            it('should handle numeric conversationId', () => {
+                const queryParams = {
+                    conversationId: '123',
+                };
+                activatedRoute.queryParams = of(queryParams);
+                const spy = jest.spyOn(component, 'closeSidebarOnMobile');
+
+                component.subscribeToQueryParameter();
+
+                expect(setActiveConversationSpy).toHaveBeenCalledWith(123);
+                expect(spy).toHaveBeenCalled();
+            });
+
+            it('should handle focusPostId parameter', () => {
+                const queryParams = {
+                    focusPostId: '456',
+                };
+                activatedRoute.queryParams = of(queryParams);
+
+                component.subscribeToQueryParameter();
+
+                expect(component['focusPostId']).toBe(456);
+            });
+
+            it('should handle openThreadOnFocus parameter', () => {
+                const queryParams = {
+                    openThreadOnFocus: 'true',
+                };
+                activatedRoute.queryParams = of(queryParams);
+
+                component.subscribeToQueryParameter();
+
+                expect(component['openThreadOnFocus']).toBe('true');
+            });
+
+            it('should handle messageId parameter', () => {
+                const queryParams = {
+                    messageId: '789',
+                };
+                activatedRoute.queryParams = of(queryParams);
+
+                component.subscribeToQueryParameter();
+
+                expect(component['postInThread']).toEqual({ id: 789 });
+            });
+
+            it('should clear postInThread when no messageId is present', () => {
+                const queryParams = {};
+                activatedRoute.queryParams = of(queryParams);
+
+                component.subscribeToQueryParameter();
+
+                expect(component['postInThread']).toBeUndefined();
+            });
+
+            it('should handle multiple query parameters together', () => {
+                const queryParams = {
+                    conversationId: SavedPostStatusMap.ARCHIVED.toString(),
+                    focusPostId: '456',
+                    openThreadOnFocus: 'true',
+                    messageId: '789',
+                };
+                activatedRoute.queryParams = of(queryParams);
+
+                component.subscribeToQueryParameter();
+
+                expect(component['selectedSavedPostStatus']).toBe(SavedPostStatus.ARCHIVED);
+                expect(component['focusPostId']).toBe(456);
+                expect(component['openThreadOnFocus']).toBe('true');
+                expect(component['postInThread']).toEqual({ id: 789 });
+            });
+        });
+
+        describe('navigate to post functionality', () => {
+            it('should handle answer post navigation correctly', () => {
+                const answerPost: Posting = {
+                    referencePostId: 123,
+                    postingType: PostingType.ANSWER,
+                    conversation: {
+                        id: 456,
+                    },
+                };
+
+                component.onNavigateToPost(answerPost);
+
+                expect(component['focusPostId']).toBe(123);
+                expect(component['openThreadOnFocus']).toBeTrue();
+                expect(setActiveConversationSpy).toHaveBeenCalledWith(456);
+            });
+
+            it('should handle question post navigation correctly', () => {
+                const questionPost: Posting = {
+                    referencePostId: 123,
+                    postingType: PostingType.POST,
+                    conversation: {
+                        id: 456,
+                    },
+                };
+
+                component.onNavigateToPost(questionPost);
+
+                expect(component['focusPostId']).toBe(123);
+                expect(component['openThreadOnFocus']).toBeFalse();
+                expect(setActiveConversationSpy).toHaveBeenCalledWith(456);
+            });
+
+            it('should not process navigation when referencePostId is undefined', () => {
+                const invalidPost: Posting = {
+                    postingType: PostingType.POST,
+                    conversation: {
+                        id: 456,
+                    },
+                };
+
+                component.onNavigateToPost(invalidPost);
+
+                expect(setActiveConversationSpy).not.toHaveBeenCalled();
+            });
+
+            it('should not process navigation when conversation id is undefined', () => {
+                const invalidPost: Posting = {
+                    referencePostId: 123,
+                    postingType: PostingType.POST,
+                    conversation: {},
+                };
+
+                component.onNavigateToPost(invalidPost);
+
+                expect(setActiveConversationSpy).not.toHaveBeenCalled();
+            });
+        });
+
+        describe('conversation selection', () => {
+            it('should handle numeric conversationId', () => {
+                component.onConversationSelected(123);
+                expect(component.selectedSavedPostStatus).toBeNull();
+                expect(setActiveConversationSpy).toHaveBeenCalledWith(123);
+            });
+
+            it('should handle valid string conversationId as SavedPostStatus', () => {
+                const validStatus = SavedPostStatusMap.ARCHIVED.toString();
+                component.onConversationSelected(validStatus);
+                expect(component.selectedSavedPostStatus).toBe(SavedPostStatus.ARCHIVED);
+                expect(component.postInThread).toBeUndefined();
+                expect(setActiveConversationSpy).toHaveBeenCalledWith(undefined);
+                expect(component.activeConversation).toBeUndefined();
+            });
+
+            it('should ignore invalid string conversationId', () => {
+                const invalidStatus = 'invalidStatus';
+                component.onConversationSelected(invalidStatus);
+                expect(component.selectedSavedPostStatus).toBeNull();
+                expect(metisConversationService.setActiveConversation).not.toHaveBeenCalled();
+            });
+        });
     });
 });
diff --git a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts
index 407333ead201..9884da1a010a 100644
--- a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts
@@ -162,12 +162,12 @@ examples.forEach((activeConversation) => {
             const fetchNextPageSpy = jest.spyOn(component, 'fetchNextPage').mockImplementation(() => {});
             const existingScrollPosition = 1;
 
-            component.goToLastSelectedElement(existingScrollPosition);
+            component.goToLastSelectedElement(existingScrollPosition, false);
             tick();
             expect(fetchNextPageSpy).not.toHaveBeenCalled();
 
             const nonExistingScrollPosition = 999;
-            component.goToLastSelectedElement(nonExistingScrollPosition);
+            component.goToLastSelectedElement(nonExistingScrollPosition, false);
             tick();
 
             expect(fetchNextPageSpy).toHaveBeenCalled();
diff --git a/src/test/javascript/spec/component/overview/course-conversations/posting-summary.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/posting-summary.component.spec.ts
new file mode 100644
index 000000000000..450135f6923c
--- /dev/null
+++ b/src/test/javascript/spec/component/overview/course-conversations/posting-summary.component.spec.ts
@@ -0,0 +1,171 @@
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { PostingSummaryComponent } from 'app/overview/course-conversations/posting-summary/posting-summary.component';
+import { Posting, PostingType, SavedPostStatus } from 'app/entities/metis/posting.model';
+import { ConversationType } from 'app/entities/metis/conversation/conversation.model';
+import dayjs from 'dayjs/esm';
+import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
+import { MockComponent, MockPipe } from 'ng-mocks';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component';
+import { PostingContentComponent } from 'app/shared/metis/posting-content/posting-content.components';
+
+describe('PostingSummaryComponent', () => {
+    let component: PostingSummaryComponent;
+    let fixture: ComponentFixture<PostingSummaryComponent>;
+
+    const mockPost: Posting = {
+        id: 1,
+        author: {
+            id: 1,
+            name: 'Test Author',
+            internal: false,
+        },
+        content: 'Test Content',
+        postingType: PostingType.POST,
+        creationDate: dayjs(),
+        conversation: {
+            id: 1,
+            title: 'Test Conversation',
+            type: ConversationType.CHANNEL,
+        },
+    };
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            declarations: [
+                PostingSummaryComponent,
+                MockPipe(ArtemisDatePipe),
+                MockComponent(FaIconComponent),
+                MockComponent(ProfilePictureComponent),
+                MockComponent(PostingContentComponent),
+            ], // Changed from imports to declarations
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(PostingSummaryComponent);
+        component = fixture.componentInstance;
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+
+    describe('Input handling', () => {
+        it('should handle post input', () => {
+            fixture.componentRef.setInput('post', mockPost);
+            fixture.detectChanges();
+
+            // Assert
+            expect(component['isAnswerPost']).toBeFalsy();
+            expect(component['postingIsOfToday']).toBeTruthy();
+        });
+
+        it('should handle undefined post', () => {
+            fixture.componentRef.setInput('post', undefined);
+            fixture.detectChanges();
+
+            expect(component['isAnswerPost']).toBeFalsy();
+        });
+    });
+
+    describe('PostingType detection', () => {
+        it('should detect answer post', () => {
+            const answerPost = { ...mockPost, postingType: PostingType.ANSWER.valueOf() };
+
+            fixture.componentRef.setInput('post', answerPost);
+            fixture.detectChanges();
+
+            expect(component['isAnswerPost']).toBeTruthy();
+        });
+
+        it('should detect non-answer post', () => {
+            fixture.componentRef.setInput('post', mockPost);
+            fixture.detectChanges();
+
+            expect(component['isAnswerPost']).toBeFalsy();
+        });
+    });
+
+    describe('Date handling', () => {
+        it('should detect post from today', () => {
+            const todayPost = { ...mockPost, creationDate: dayjs() };
+
+            fixture.componentRef.setInput('post', todayPost);
+            fixture.detectChanges();
+
+            expect(component['postingIsOfToday']).toBeTruthy();
+        });
+
+        it('should detect post not from today', () => {
+            const yesterdayPost = { ...mockPost, creationDate: dayjs().subtract(1, 'day') };
+
+            fixture.componentRef.setInput('post', yesterdayPost);
+            fixture.detectChanges();
+
+            expect(component['postingIsOfToday']).toBeFalsy();
+        });
+    });
+
+    describe('Event emissions', () => {
+        it('should emit status change', () => {
+            const emitSpy = jest.spyOn(component.onChangeSavedPostStatus, 'emit');
+            const newStatus = SavedPostStatus.ARCHIVED;
+
+            component['onStatusChangeClick'](newStatus);
+
+            expect(emitSpy).toHaveBeenCalledWith(newStatus);
+        });
+
+        it('should emit navigation event with post', () => {
+            const emitSpy = jest.spyOn(component.onNavigateToPost, 'emit');
+            fixture.componentRef.setInput('post', mockPost);
+
+            component['onTriggerNavigateToPost']();
+
+            expect(emitSpy).toHaveBeenCalledWith(mockPost);
+        });
+
+        it('should not emit navigation event when post is undefined', () => {
+            const emitSpy = jest.spyOn(component.onNavigateToPost, 'emit');
+            fixture.componentRef.setInput('post', undefined);
+
+            component['onTriggerNavigateToPost']();
+
+            expect(emitSpy).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('Template rendering', () => {
+        beforeEach(fakeAsync(() => {
+            fixture.componentRef.setInput('post', mockPost);
+            fixture.detectChanges();
+            tick();
+            fixture.detectChanges();
+        }));
+
+        it('should render author name', () => {
+            const authorElement = fixture.nativeElement.querySelector('.posting-summary-author-content');
+            expect(authorElement.textContent).toContain(mockPost.author!.name);
+        });
+
+        it('should render conversation title', () => {
+            const conversationElement = fixture.nativeElement.querySelector('.posting-summary-conversation');
+            expect(conversationElement.textContent).toContain(mockPost.conversation!.title);
+        });
+
+        it('should show saved post options when enabled', () => {
+            fixture.componentRef.setInput('isShowSavedPostOptions', true);
+            fixture.detectChanges();
+
+            const optionsElement = fixture.nativeElement.querySelector('.posting-summary-saved-post-options');
+            expect(optionsElement).toBeTruthy();
+        });
+
+        it('should not show saved post options when disabled', () => {
+            fixture.componentRef.setInput('isShowSavedPostOptions', false);
+            fixture.detectChanges();
+
+            const optionsElement = fixture.nativeElement.querySelector('.posting-summary-saved-post-options');
+            expect(optionsElement).toBeFalsy();
+        });
+    });
+});
diff --git a/src/test/javascript/spec/component/overview/course-conversations/saved-posts.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/saved-posts.component.spec.ts
new file mode 100644
index 000000000000..1d3bd88f6878
--- /dev/null
+++ b/src/test/javascript/spec/component/overview/course-conversations/saved-posts.component.spec.ts
@@ -0,0 +1,145 @@
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { SavedPostsComponent } from 'app/overview/course-conversations/saved-posts/saved-posts.component';
+import { SavedPostService } from 'app/shared/metis/saved-post.service';
+import { Posting, SavedPostStatus } from 'app/entities/metis/posting.model';
+import { EMPTY, of, throwError } from 'rxjs';
+import { MockComponent, MockDirective } from 'ng-mocks';
+import { HttpResponse } from '@angular/common/http';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { PostingSummaryComponent } from 'app/overview/course-conversations/posting-summary/posting-summary.component';
+
+describe('SavedPostsComponent', () => {
+    let component: SavedPostsComponent;
+    let fixture: ComponentFixture<SavedPostsComponent>;
+    let savedPostService: jest.Mocked<SavedPostService>;
+
+    const mockPosting: Posting = {
+        id: 1,
+        content: 'Test Content',
+    };
+
+    const mockPostings: Posting[] = [mockPosting, { id: 2, content: 'Test Content 2' }];
+
+    beforeEach(async () => {
+        const mockSavedPostService = {
+            fetchSavedPosts: jest.fn(),
+            convertPostingToCorrespondingType: jest.fn((post) => post),
+            changeSavedPostStatus: jest.fn(),
+        };
+
+        await TestBed.configureTestingModule({
+            declarations: [SavedPostsComponent, MockDirective(TranslateDirective), MockComponent(FaIconComponent), MockComponent(PostingSummaryComponent)],
+            providers: [{ provide: SavedPostService, useValue: mockSavedPostService }],
+        }).compileComponents();
+
+        savedPostService = TestBed.inject(SavedPostService) as jest.Mocked<SavedPostService>;
+        fixture = TestBed.createComponent(SavedPostsComponent);
+        component = fixture.componentInstance;
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+
+    describe('Initialization', () => {
+        it('should fetch saved posts successfully', fakeAsync(() => {
+            const courseId = 123;
+            const status = SavedPostStatus.PROGRESS;
+            savedPostService.fetchSavedPosts.mockReturnValue(of(new HttpResponse({ body: mockPostings })));
+
+            fixture.componentRef.setInput('courseId', courseId);
+            fixture.componentRef.setInput('savedPostStatus', status);
+            fixture.detectChanges();
+
+            expect(savedPostService.fetchSavedPosts).toHaveBeenCalledWith(courseId, status);
+            expect(component['posts']).toEqual(mockPostings);
+            expect(component['hiddenPosts']).toEqual([]);
+        }));
+
+        it('should handle empty response', fakeAsync(() => {
+            const courseId = 123;
+            const status = SavedPostStatus.PROGRESS;
+            savedPostService.fetchSavedPosts.mockReturnValue(of(new HttpResponse({ body: [] })));
+
+            fixture.componentRef.setInput('courseId', courseId);
+            fixture.componentRef.setInput('savedPostStatus', status);
+            fixture.detectChanges();
+
+            expect(component['posts']).toEqual([]);
+        }));
+
+        it('should handle error response', fakeAsync(() => {
+            const courseId = 123;
+            const status = SavedPostStatus.PROGRESS;
+            savedPostService.fetchSavedPosts.mockReturnValue(throwError(() => new Error('Test error')));
+
+            fixture.componentRef.setInput('courseId', courseId);
+            fixture.componentRef.setInput('savedPostStatus', status);
+            fixture.detectChanges();
+
+            expect(component['posts']).toEqual([]);
+        }));
+    });
+
+    describe('Change post status', () => {
+        it('should update post status and add to hidden posts', fakeAsync(() => {
+            const newStatus = SavedPostStatus.ARCHIVED;
+            savedPostService.changeSavedPostStatus.mockReturnValue(of({}));
+
+            component['changeSavedPostStatus'](mockPosting, newStatus);
+
+            expect(savedPostService.changeSavedPostStatus).toHaveBeenCalledWith(mockPosting, SavedPostStatus.ARCHIVED);
+            expect(component['hiddenPosts']).toContain(mockPosting.id);
+        }));
+    });
+
+    describe('Navigation', () => {
+        it('should emit post when navigating', () => {
+            const emitSpy = jest.spyOn(component.onNavigateToPost, 'emit');
+
+            component['onTriggerNavigateToPost'](mockPosting);
+
+            expect(emitSpy).toHaveBeenCalledWith(mockPosting);
+        });
+    });
+
+    describe('Template interaction', () => {
+        beforeEach(async () => {
+            const status = SavedPostStatus.PROGRESS;
+            fixture.componentRef.setInput('savedPostStatus', status);
+            savedPostService.fetchSavedPosts.mockReturnValue(EMPTY);
+        });
+
+        it('should show empty notice when no posts are available', () => {
+            component['posts'] = [];
+            fixture.detectChanges();
+
+            const emptyNotice = fixture.nativeElement.querySelector('.saved-posts-empty-notice');
+            expect(emptyNotice).toBeTruthy();
+        });
+
+        it('should not show empty notice when posts are available', fakeAsync(() => {
+            const courseId = 123;
+            savedPostService.fetchSavedPosts.mockReturnValue(of(new HttpResponse({ body: mockPostings })));
+            fixture.componentRef.setInput('courseId', courseId);
+            fixture.detectChanges();
+            tick();
+            fixture.detectChanges();
+
+            const emptyNotice = fixture.nativeElement.querySelector('.saved-posts-empty-notice');
+            expect(emptyNotice).toBeFalsy();
+        }));
+
+        it('should show delete post notice when archived is selected', fakeAsync(() => {
+            fixture.componentRef.setInput('savedPostStatus', SavedPostStatus.ARCHIVED);
+            fixture.detectChanges();
+            tick();
+            fixture.detectChanges();
+
+            const optionsElement = fixture.nativeElement.querySelector('.saved-posts-delete-notice');
+            expect(component['isShowDeleteNotice']).toBeTruthy();
+            expect(optionsElement).toBeTruthy();
+        }));
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/metis/answer-post/answer-post.component.spec.ts b/src/test/javascript/spec/component/shared/metis/answer-post/answer-post.component.spec.ts
index 247786e4fc12..441b3e4ef382 100644
--- a/src/test/javascript/spec/component/shared/metis/answer-post/answer-post.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/metis/answer-post/answer-post.component.spec.ts
@@ -15,6 +15,8 @@ import { Reaction } from '../../../../../../../main/webapp/app/entities/metis/re
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { MockMetisService } from '../../../../helpers/mocks/service/mock-metis-service.service';
+import { Posting, PostingType } from 'app/entities/metis/posting.model';
+import { AnswerPost } from 'app/entities/metis/answer-post.model';
 
 describe('AnswerPostComponent', () => {
     let component: AnswerPostComponent;
@@ -175,4 +177,24 @@ describe('AnswerPostComponent', () => {
 
         expect(component.posting.reactions).toEqual(updatedReactions);
     });
+
+    it('should cast the post to answer post on change', () => {
+        const mockPost: Posting = {
+            id: 1,
+            author: {
+                id: 1,
+                name: 'Test Author',
+                internal: false,
+            },
+            content: 'Test Content',
+            postingType: PostingType.ANSWER,
+        };
+        // @ts-ignore method is private
+        const spy = jest.spyOn(component, 'assignPostingToAnswerPost');
+        component.posting = mockPost;
+        fixture.detectChanges();
+
+        expect(component.posting).toBeInstanceOf(AnswerPost);
+        expect(spy).toHaveBeenCalled();
+    });
 });
diff --git a/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts b/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts
index c7c9cf4f24db..6d0a1940a7d9 100644
--- a/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts
@@ -36,6 +36,8 @@ import { AnswerPostCreateEditModalComponent } from 'app/shared/metis/posting-cre
 import { PostReactionsBarComponent } from 'app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { DOCUMENT } from '@angular/common';
+import { Posting, PostingType } from 'app/entities/metis/posting.model';
+import { Post } from 'app/entities/metis/post.model';
 
 describe('PostComponent', () => {
     let component: PostComponent;
@@ -320,4 +322,24 @@ describe('PostComponent', () => {
         expect(component.showDropdown).toBeFalse();
         expect(enableBodyScrollSpy).toHaveBeenCalled();
     });
+
+    it('should cast the post to Post on change', () => {
+        const mockPost: Posting = {
+            id: 1,
+            author: {
+                id: 1,
+                name: 'Test Author',
+                internal: false,
+            },
+            content: 'Test Content',
+            postingType: PostingType.POST,
+        };
+        // @ts-ignore method is private
+        const spy = jest.spyOn(component, 'assignPostingToPost');
+        component.posting = mockPost;
+        fixture.detectChanges();
+
+        expect(component.posting).toBeInstanceOf(Post);
+        expect(spy).toHaveBeenCalled();
+    });
 });
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-metis-service.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-metis-service.service.ts
index 1ff172fc7f65..809f4991dc9f 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-metis-service.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-metis-service.service.ts
@@ -60,6 +60,8 @@ export class MockMetisService {
 
     deleteReaction(reaction: Reaction): void {}
 
+    resetCachedPosts(): void {}
+
     metisUserIsAtLeastTutorInCourse(): boolean {
         return true;
     }
diff --git a/src/test/javascript/spec/helpers/sample/metis-sample-data.ts b/src/test/javascript/spec/helpers/sample/metis-sample-data.ts
index 02601e3a181d..8230382a804e 100644
--- a/src/test/javascript/spec/helpers/sample/metis-sample-data.ts
+++ b/src/test/javascript/spec/helpers/sample/metis-sample-data.ts
@@ -167,6 +167,7 @@ export const metisPostExerciseUser1 = {
     title: 'title',
     content: 'metisPostExerciseUser1',
     creationDate: undefined,
+    isSaved: false,
 } as Post;
 
 export const metisPostExerciseUser2 = {
diff --git a/src/test/javascript/spec/service/metis/metis.service.spec.ts b/src/test/javascript/spec/service/metis/metis.service.spec.ts
index cfbd0b7b7825..0e738ebfac68 100644
--- a/src/test/javascript/spec/service/metis/metis.service.spec.ts
+++ b/src/test/javascript/spec/service/metis/metis.service.spec.ts
@@ -46,6 +46,8 @@ import { HttpHeaders, HttpResponse, provideHttpClient } from '@angular/common/ht
 import { ConversationService } from 'app/shared/metis/conversations/conversation.service';
 import { NotificationService } from 'app/shared/notification/notification.service';
 import { MockNotificationService } from '../../helpers/mocks/service/mock-notification.service';
+import { SavedPostService } from 'app/shared/metis/saved-post.service';
+import { SavedPostStatus } from 'app/entities/metis/posting.model';
 
 describe('Metis Service', () => {
     let metisService: MetisService;
@@ -63,6 +65,8 @@ describe('Metis Service', () => {
     let answerPost: AnswerPost;
     let reaction: Reaction;
     let course: Course;
+    let savedPostService: SavedPostService;
+    let setIsSavedAndStatusOfPostSpy: jest.SpyInstance;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -89,9 +93,12 @@ describe('Metis Service', () => {
         postService = TestBed.inject(PostService);
         answerPostService = TestBed.inject(AnswerPostService);
         conversationService = TestBed.inject(ConversationService);
+        savedPostService = TestBed.inject(SavedPostService);
         metisServiceGetFilteredPostsSpy = jest.spyOn(metisService, 'getFilteredPosts');
         metisServiceCreateWebsocketSubscriptionSpy = jest.spyOn(metisService, 'createWebsocketSubscription');
         metisServiceUserStub = jest.spyOn(metisService, 'getUser');
+        // @ts-ignore method is private
+        setIsSavedAndStatusOfPostSpy = jest.spyOn(metisService, 'setIsSavedAndStatusOfPost');
 
         post = metisPostExerciseUser1;
         post.displayPriority = DisplayPriority.PINNED;
@@ -630,4 +637,48 @@ describe('Metis Service', () => {
             expect(metisService.getCurrentConversation()).toBe(metisLectureChannelDTO);
         });
     });
+
+    describe('Save post methods', () => {
+        it('should save a post and update cached posts', () => {
+            const savedPostServiceSpy = jest.spyOn(savedPostService, 'savePost');
+
+            metisService.createPost(post).subscribe();
+            metisService.savePost(post);
+
+            expect(setIsSavedAndStatusOfPostSpy).toHaveBeenCalledWith(post, true, post.savedPostStatus);
+            expect(savedPostServiceSpy).toHaveBeenCalledWith(post);
+        });
+
+        it('should remove a saved post and update cached posts', () => {
+            const savedPostServiceSpy = jest.spyOn(savedPostService, 'removeSavedPost');
+
+            metisService.createPost(post).subscribe();
+            metisService.removeSavedPost(post);
+
+            expect(setIsSavedAndStatusOfPostSpy).toHaveBeenCalledWith(post, false, post.savedPostStatus);
+            expect(savedPostServiceSpy).toHaveBeenCalledWith(post);
+        });
+
+        it('should change the saved post status and update cached posts', () => {
+            const status = SavedPostStatus.ARCHIVED;
+            const savedPostServiceSpy = jest.spyOn(savedPostService, 'changeSavedPostStatus');
+
+            metisService.createPost(post).subscribe();
+            metisService.changeSavedPostStatus(post, status);
+
+            expect(setIsSavedAndStatusOfPostSpy).toHaveBeenCalledWith(post, post.isSaved, status);
+            expect(savedPostServiceSpy).toHaveBeenCalled();
+        });
+
+        it('should reset cached posts and update total number of posts', () => {
+            const spyPostsNext = jest.spyOn(metisService['posts$'], 'next');
+            const spyNumberOfPostsNext = jest.spyOn(metisService['totalNumberOfPosts$'], 'next');
+            metisService.resetCachedPosts();
+
+            expect(metisService['cachedPosts']).toEqual([]);
+            expect(spyPostsNext).toHaveBeenCalledWith([]);
+            expect(metisService['cachedTotalNumberOfPosts']).toBe(0);
+            expect(spyNumberOfPostsNext).toHaveBeenCalledWith(0);
+        });
+    });
 });
diff --git a/src/test/javascript/spec/service/metis/saved-post.service.spec.ts b/src/test/javascript/spec/service/metis/saved-post.service.spec.ts
new file mode 100644
index 000000000000..7be01c348743
--- /dev/null
+++ b/src/test/javascript/spec/service/metis/saved-post.service.spec.ts
@@ -0,0 +1,149 @@
+import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
+import { SavedPostService } from 'app/shared/metis/saved-post.service';
+import { Post } from 'app/entities/metis/post.model';
+import { Posting, PostingType, SavedPostStatus } from 'app/entities/metis/posting.model';
+import { AnswerPost } from 'app/entities/metis/answer-post.model';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { ConversationType } from 'app/entities/metis/conversation/conversation.model';
+import Dayjs from 'dayjs/esm';
+
+describe('SavedPostService', () => {
+    let service: SavedPostService;
+    let httpMock: HttpTestingController;
+    const resourceUrl = 'api/saved-posts/';
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [],
+            providers: [SavedPostService, provideHttpClient(), provideHttpClientTesting()],
+        });
+
+        service = TestBed.inject(SavedPostService);
+        httpMock = TestBed.inject(HttpTestingController);
+    });
+
+    it('should create', () => {
+        expect(service).toBeTruthy();
+    });
+
+    afterEach(() => {
+        httpMock.verify();
+    });
+
+    describe('Save post', () => {
+        it('should save a post if given a Post model', () => {
+            const post = new Post();
+            post.id = 1;
+
+            service.savePost(post).subscribe();
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${PostingType.POST}`);
+            expect(req.request.method).toBe('POST');
+        });
+
+        it('should save an answer if given AnswerPost model', () => {
+            const answerPost = new AnswerPost();
+            answerPost.id = 1;
+
+            service.savePost(answerPost).subscribe();
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${PostingType.ANSWER}`);
+            expect(req.request.method).toBe('POST');
+        });
+    });
+
+    describe('Remove saved post', () => {
+        it('should remove a post when provided with Post model', () => {
+            const post = new Post();
+            post.id = 1;
+
+            service.removeSavedPost(post).subscribe();
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${PostingType.POST}`);
+            expect(req.request.method).toBe('DELETE');
+        });
+
+        it('should remove a answer when provided with AnswerPost model', () => {
+            const answerPost = new AnswerPost();
+            answerPost.id = 1;
+
+            service.removeSavedPost(answerPost).subscribe();
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${PostingType.ANSWER}`);
+            expect(req.request.method).toBe('DELETE');
+        });
+    });
+
+    describe('Update saved post', () => {
+        it('should update post status to PROGRESS if provided with Post model and PROGRESS', () => {
+            const post = new Post();
+            post.id = 1;
+
+            service.changeSavedPostStatus(post, SavedPostStatus.PROGRESS).subscribe();
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${PostingType.POST}?status=${SavedPostStatus.PROGRESS}`);
+            expect(req.request.method).toBe('PUT');
+        });
+
+        it('should update answer post status to COMPLETED if provided with AnswerPost model and COMPLETED', () => {
+            const answerPost = new AnswerPost();
+            answerPost.id = 1;
+
+            service.changeSavedPostStatus(answerPost, SavedPostStatus.COMPLETED).subscribe();
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${PostingType.ANSWER}?status=${SavedPostStatus.COMPLETED}`);
+            expect(req.request.method).toBe('PUT');
+        });
+    });
+
+    describe('Fetch saved posts', () => {
+        it('should fetch saved posts and convert dates accordingly', fakeAsync(() => {
+            const courseId = 1;
+            const status = SavedPostStatus.PROGRESS;
+            const mockPosts = [
+                {
+                    id: 1,
+                    creationDate: '2024-03-20T10:00:00Z',
+                    updatedDate: '2024-03-20T11:00:00Z',
+                    conversation: { id: 1, type: ConversationType.CHANNEL },
+                },
+            ];
+
+            const fetchPost = service.fetchSavedPosts(courseId, status).subscribe((response) => {
+                expect(response.body?.[0].conversation?.type).toBe(ConversationType.CHANNEL);
+                expect(response.body?.[0].creationDate).toBeInstanceOf(Dayjs);
+                expect(response.body?.[0].updatedDate).toBeInstanceOf(Dayjs);
+            });
+
+            const req = httpMock.expectOne(`${resourceUrl}1/${SavedPostStatus.PROGRESS}`);
+            expect(req.request.method).toBe('GET');
+            req.flush(mockPosts, { status: 200, statusText: 'OK' });
+            tick();
+            fetchPost.unsubscribe();
+        }));
+    });
+
+    describe('Conversions of posts', () => {
+        it('should convert posting to Post type', () => {
+            const posting: Posting = {
+                id: 1,
+                postingType: PostingType.POST,
+            } as Posting;
+
+            const result = service.convertPostingToCorrespondingType(posting);
+            expect(result).toBeInstanceOf(Post);
+        });
+
+        it('should convert posting to AnswerPost type', () => {
+            const posting: Posting = {
+                id: 1,
+                postingType: PostingType.ANSWER,
+            } as Posting;
+
+            const result = service.convertPostingToCorrespondingType(posting);
+            expect(result).toBeInstanceOf(AnswerPost);
+        });
+    });
+});
diff --git a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts
index ea6e00a07aea..4881c7337718 100644
--- a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts
@@ -55,9 +55,6 @@ test.beforeAll('Create course', async ({ browser }) => {
 
 test.describe('Exam assessment', () => {
     test.describe.configure({ mode: 'serial' });
-    let programmingAssessmentSuccessful = false;
-    let modelingAssessmentSuccessful = false;
-    let textAssessmentSuccessful = false;
 
     test.describe.serial('Programming exercise assessment', { tag: '@sequential' }, () => {
         test.beforeAll('Prepare exam', async ({ browser }) => {
@@ -76,13 +73,10 @@ test.describe('Exam assessment', () => {
             await examAssessment.submit();
             await login(studentOne, `/courses/${course.id}/exams/${exam.id}`);
             await examParticipation.checkResultScore('66.2%');
-            programmingAssessmentSuccessful = true;
         });
 
         test('Complaints about programming exercises assessment', async ({ examAssessment, page, studentAssessment, examManagement, courseAssessment, exerciseAssessment }) => {
-            if (programmingAssessmentSuccessful) {
-                await handleComplaint(course, exam, false, ExerciseType.PROGRAMMING, page, studentAssessment, examManagement, examAssessment, courseAssessment, exerciseAssessment);
-            }
+            await handleComplaint(course, exam, false, ExerciseType.PROGRAMMING, page, studentAssessment, examManagement, examAssessment, courseAssessment, exerciseAssessment);
         });
     });
 
@@ -117,21 +111,18 @@ test.describe('Exam assessment', () => {
             await login(studentOne, `/courses/${course.id}/exams/${exam.id}`);
 
             await examParticipation.checkResultScore('40%');
-            modelingAssessmentSuccessful = true;
         });
 
         test('Complaints about modeling exercises assessment', async ({ examAssessment, page, studentAssessment, examManagement, courseAssessment, exerciseAssessment }) => {
-            if (modelingAssessmentSuccessful) {
-                await handleComplaint(course, exam, true, ExerciseType.MODELING, page, studentAssessment, examManagement, examAssessment, courseAssessment, exerciseAssessment);
-            }
+            await handleComplaint(course, exam, true, ExerciseType.MODELING, page, studentAssessment, examManagement, examAssessment, courseAssessment, exerciseAssessment);
         });
     });
 
     test.describe.serial('Text exercise assessment', { tag: '@slow' }, () => {
         test.beforeAll('Prepare exam', async ({ browser }) => {
-            examEnd = dayjs().add(40, 'seconds');
+            examEnd = dayjs().add(20, 'seconds');
             const page = await newBrowserPage(browser);
-            await prepareExam(course, examEnd, ExerciseType.TEXT, page);
+            await prepareExam(course, examEnd, ExerciseType.TEXT, page, 2);
         });
 
         test('Assess a text exercise submission', async ({ login, examManagement, examAssessment, examParticipation, courseAssessment, exerciseAssessment }) => {
@@ -144,13 +135,20 @@ test.describe('Exam assessment', () => {
             expect(response.status()).toBe(200);
             await login(studentOne, `/courses/${course.id}/exams/${exam.id}`);
             await examParticipation.checkResultScore('70%');
-            textAssessmentSuccessful = true;
+        });
+
+        test('Instructor makes a second round of assessment', async ({ login, examManagement, examAssessment, examParticipation, courseAssessment, exerciseAssessment }) => {
+            await login(instructor);
+            await startAssessing(course.id!, exam.id!, 60000, examManagement, courseAssessment, exerciseAssessment, true, true);
+            await examAssessment.fillFeedback(9, 'Great job');
+            const response = await examAssessment.submitTextAssessment();
+            expect(response.status()).toBe(200);
+            await login(studentOne, `/courses/${course.id}/exams/${exam.id}`);
+            await examParticipation.checkResultScore('90%');
         });
 
         test('Complaints about text exercises assessment', async ({ examAssessment, page, studentAssessment, examManagement, courseAssessment, exerciseAssessment }) => {
-            if (textAssessmentSuccessful) {
-                await handleComplaint(course, exam, false, ExerciseType.TEXT, page, studentAssessment, examManagement, examAssessment, courseAssessment, exerciseAssessment);
-            }
+            await handleComplaint(course, exam, true, ExerciseType.TEXT, page, studentAssessment, examManagement, examAssessment, courseAssessment, exerciseAssessment, false);
         });
     });
 
@@ -296,7 +294,7 @@ test.afterAll('Delete course', async ({ browser }) => {
     await courseManagementAPIRequests.deleteCourse(course, admin);
 });
 
-export async function prepareExam(course: Course, end: dayjs.Dayjs, exerciseType: ExerciseType, page: Page): Promise<Exam> {
+export async function prepareExam(course: Course, end: dayjs.Dayjs, exerciseType: ExerciseType, page: Page, numberOfCorrectionRounds: number = 1): Promise<Exam> {
     const examAPIRequests = new ExamAPIRequests(page);
     const exerciseAPIRequests = new ExerciseAPIRequests(page);
     const examExerciseGroupCreation = new ExamExerciseGroupCreationPage(page, examAPIRequests, exerciseAPIRequests);
@@ -326,7 +324,7 @@ export async function prepareExam(course: Course, end: dayjs.Dayjs, exerciseType
         course,
         startDate: dayjs(),
         endDate: end,
-        numberOfCorrectionRoundsInExam: 1,
+        numberOfCorrectionRoundsInExam: numberOfCorrectionRounds,
         examStudentReviewStart: resultDate,
         examStudentReviewEnd: resultDate.add(1, 'minute'),
         publishResultsDate: resultDate,
@@ -379,10 +377,17 @@ async function startAssessing(
     examManagement: ExamManagementPage,
     courseAssessment: CourseAssessmentDashboardPage,
     exerciseAssessment: ExerciseAssessmentDashboardPage,
+    toggleSecondRound: boolean = false,
+    isFirstTimeAssessing: boolean = true,
 ) {
     await examManagement.openAssessmentDashboard(courseID, examID, timeout);
     await courseAssessment.clickExerciseDashboardButton();
-    await exerciseAssessment.clickHaveReadInstructionsButton();
+    if (toggleSecondRound) {
+        await exerciseAssessment.toggleSecondCorrectionRound();
+    }
+    if (isFirstTimeAssessing) {
+        await exerciseAssessment.clickHaveReadInstructionsButton();
+    }
     await exerciseAssessment.clickStartNewAssessment();
     exerciseAssessment.getLockedMessage();
 }
@@ -398,6 +403,7 @@ async function handleComplaint(
     examAssessment: ExamAssessmentPage,
     courseAssessment: CourseAssessmentDashboardPage,
     exerciseAssessment: ExerciseAssessmentDashboardPage,
+    isFirstTimeAssessing: boolean = true,
 ) {
     const complaintText = 'Lorem ipsum dolor sit amet';
     const complaintResponseText = ' consetetur sadipscing elitr';
@@ -411,8 +417,9 @@ async function handleComplaint(
     await Commands.login(page, instructor, `/course-management/${course.id}/exams`);
     await examManagement.openAssessmentDashboard(course.id!, exam.id!);
     await courseAssessment.clickExerciseDashboardButton();
-    await exerciseAssessment.clickHaveReadInstructionsButton();
-
+    if (isFirstTimeAssessing) {
+        await exerciseAssessment.clickHaveReadInstructionsButton();
+    }
     await exerciseAssessment.clickEvaluateComplaint();
     await exerciseAssessment.checkComplaintText(complaintText);
     page.on('dialog', (dialog) => dialog.accept());
@@ -421,7 +428,7 @@ async function handleComplaint(
     } else {
         await examAssessment.acceptComplaint(complaintResponseText, true, exerciseType);
     }
-    if (exerciseType == ExerciseType.MODELING) {
+    if (exerciseType == ExerciseType.MODELING || reject) {
         await examAssessment.checkComplaintMessage('Response to complaint has been submitted');
     } else {
         await examAssessment.checkComplaintMessage('The assessment was updated successfully.');
diff --git a/src/test/playwright/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts b/src/test/playwright/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts
index 4a192240bf79..ba370c23cb34 100644
--- a/src/test/playwright/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts
+++ b/src/test/playwright/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts
@@ -13,6 +13,10 @@ export abstract class AbstractExerciseAssessmentPage {
 
     async addNewFeedback(points: number, feedback?: string) {
         await this.page.locator('.add-unreferenced-feedback').click();
+        await this.fillFeedback(points, feedback);
+    }
+
+    async fillFeedback(points: number, feedback?: string) {
         const unreferencedFeedback = this.page.locator('.unreferenced-feedback-detail');
         await unreferencedFeedback.locator('#feedback-points').clear();
         await unreferencedFeedback.locator('#feedback-points').fill(points.toString());
@@ -61,7 +65,11 @@ export abstract class AbstractExerciseAssessmentPage {
                 responsePromise = this.page.waitForResponse(`${BASE_API}/programming-submissions/*/assessment-after-complaint`);
                 break;
             case ExerciseType.TEXT:
-                responsePromise = this.page.waitForResponse(`${BASE_API}/participations/*/submissions/*/text-assessment-after-complaint`);
+                if (accept) {
+                    responsePromise = this.page.waitForResponse(`${BASE_API}/participations/*/submissions/*/text-assessment-after-complaint`);
+                } else {
+                    responsePromise = this.page.waitForResponse(`${BASE_API}/complaints/*/response`);
+                }
                 break;
             case ExerciseType.MODELING:
                 responsePromise = this.page.waitForResponse(`${BASE_API}/complaints/*/response`);
diff --git a/src/test/playwright/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts b/src/test/playwright/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts
index b501531c27f7..669abec6a3a1 100644
--- a/src/test/playwright/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts
+++ b/src/test/playwright/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts
@@ -13,8 +13,8 @@ export class ExerciseAssessmentDashboardPage {
         await this.page.click('#participate-in-assessment');
     }
 
-    async clickStartNewAssessment() {
-        const startAssessingButton = this.page.locator('#start-new-assessment');
+    async clickStartNewAssessment(assessmentRound: number = 1) {
+        const startAssessingButton = this.page.locator('#start-new-assessment').nth(assessmentRound - 1);
         await Commands.reloadUntilFound(this.page, startAssessingButton);
         await startAssessingButton.click();
     }
@@ -38,4 +38,8 @@ export class ExerciseAssessmentDashboardPage {
     async checkComplaintText(complaintText: string) {
         await expect(this.getComplaintText()).toHaveValue(complaintText);
     }
+
+    async toggleSecondCorrectionRound() {
+        await this.page.getByTestId('toggle-second-correction').click();
+    }
 }
diff --git a/src/test/resources/test-data/static-code-analysis/reports/cpd_invalid.txt b/src/test/resources/test-data/static-code-analysis/reports/cpd_invalid.txt
deleted file mode 100644
index 135463d9785e..000000000000
--- a/src/test/resources/test-data/static-code-analysis/reports/cpd_invalid.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pmd-cpd>
-    <duplication lines="16" tokens="86">
-        <file column="52" endcolumn="18" endline="75" line="60"
-              path="/opt/bambooagent/bamboo-agent-home/xml-data/build-dir/MDTESTCODE-ARTEMISTESTUSER1-JOB1/assignment/src/code/Client.java"/>
-        <file column="53" endcolumn="18" endline="97" line="75"
-              path="/opt/bambooagent/bamboo-agent-home/xml-data/build-dir/MDTESTCODE-ARTEMISTESTUSER1-JOB1/assignment/src/code/Client.java"/>
-        <codefragment><![CDATA[    private static List<Date> createRandomDatesList() throws ParseException {
-        int listLength = randomIntegerWithin(RANDOM_FLOOR, RANDOM_CEILING);
-        List<Date> list = new ArrayList<>();
-
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
-        Date lowestDate = dateFormat.parse("08.11.2016");
-        Date highestDate = dateFormat.parse("03.11.2020");
-
-        for (int i = 0; i < listLength; i++) {
-            Date randomDate = randomDateWithin(lowestDate, highestDate);
-            list.add(randomDate);
-        }
-        return list;
-    }
-
-    private static List<Date> createRandomDatesList2() throws ParseException {]]></codefragment>
-    </duplication>
-    <duplication lines="12" tokens="71">
-        <file column="9" endcolumn="9" endline="24" line="13"
-              path="/opt/bambooagent/bamboo-agent-home/xml-data/build-dir/MDTESTCODE-ARTEMISTESTUSER1-JOB1/assignment/src/code/BubbleSort.java"/>
-        <file column="9" endcolumn="9" endline="36" line="25"
-              path="/opt/bambooagent/bamboo-agent-home/xml-data/build-dir/MDTESTCODE-ARTEMISTESTUSER1-JOB1/assignment/src/code/BubbleSort.java"/>
-        <codefragment><![CDATA[        if (2 == 1) {
-            performSort(input);
-            input.add(new Date());
-            input.get(0);
-            performSort(input);
-            input.add(new Date());
-            input.get(0);
-            performSort(input);
-            input.add(new Date());
-            input.get(0);
-            input.get(0);
-        }]]></codefragment>
-    </duplication>
-</pmd-cpd>
diff --git a/supporting_scripts/generate_code_cov_table/README.md b/supporting_scripts/generate_code_cov_table/README.md
index a5495c41fe53..067334a1615d 100644
--- a/supporting_scripts/generate_code_cov_table/README.md
+++ b/supporting_scripts/generate_code_cov_table/README.md
@@ -46,7 +46,7 @@ TOKEN=ab12cd
 
 Alternatively, you can use the command line argument `--token` to pass the credentials.
 ### Token
-The token you must provide is a GitHub token with "Public Repository Access" checked.
+The token you must provide is a [GitHub token](https://github.com/settings/tokens) with "Public Repository Access" checked.
 
 **Recommended for security, but not for convenience:**  
 Don't store the `TOKEN` in the `.env` file, but let the script prompt you for it.