diff --git a/matsen-tool/src/app/app.module.ts b/matsen-tool/src/app/app.module.ts
index ff2fc2f..0f26c99 100644
--- a/matsen-tool/src/app/app.module.ts
+++ b/matsen-tool/src/app/app.module.ts
@@ -42,6 +42,7 @@ import {MatOptionModule} from "@angular/material/core";
 import {MatAutocompleteModule} from "@angular/material/autocomplete";
 import {MatFormFieldModule} from "@angular/material/form-field";
 import {MatInputModule} from "@angular/material/input";
+import { NewTaskNoteComponent } from './tasks/new-task-note/new-task-note.component';
 
 export function apiConfigFactory(): Configuration {
     const params: ConfigurationParameters = {
@@ -104,7 +105,8 @@ export function HttpLoaderFactory(http: HttpClient) {
         NewPartnerComponent,
         NewDocumentComponent,
         NewProductComponent,
-        NewCommentComponent
+        NewCommentComponent,
+        NewTaskNoteComponent
     ],
     providers: [
         {provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true},
diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
index 2d7afa2..aa6b510 100644
--- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
+++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
@@ -104,8 +104,8 @@
             <h2>{{'basic.tasks' | translate}}</h2>
             <button class="btn btn-primary" (click)="openModalNewTask()">{{'basic.new-task' | translate}}</button>
         </div>
-        <div class="tasks" *ngFor="let task of tasks">
-            <div class="card mb-3 p-3">
+        <div class="tasks mb-3" *ngFor="let task of tasks">
+            <div class="card p-3">
                 <div class="position-relative" data-bs-toggle="collapse" [attr.data-bs-target]="'#collapse-' + ApiConverter.extractId(task.id)"
                      aria-expanded="false"
                      aria-controls="collapseExample">
@@ -125,6 +125,23 @@
                     </div>
                 </div>
             </div>
+            <div class="card ms-5" *ngFor="let taskNote of task.taskNotes">
+                <div class="card-body">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <p>{{ taskNote.createdAt | date:'dd.MM.YYYY HH:mm' }}</p>
+                        <p>{{ taskNote.ownerName }}</p>
+                    </div>
+                    <div>
+                        <p>{{ taskNote.message }}</p>
+                    </div>
+                    <span *ngIf="taskNote.owner === user?.id" class="position-absolute bi bi-pencil p-2"
+                          data-type="user-tool" data-action="edit" (click)="openModalEditTaskNote(taskNote)"></span>
+                </div>
+            </div>
+
+            <div class="d-flex justify-content-end mt-1">
+                <span role="button" class="badge bg-secondary p-2" (click)="openModalNewTaskNote(task)">{{'basic.comment-it' | translate}}</span>
+            </div>
         </div>
         <mat-paginator *ngIf="tasks.length > 0" class="rounded-1"
                        [pageSizeOptions]="[10,20,30]"
diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts
index 2960458..ea86f1a 100644
--- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts
+++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts
@@ -10,7 +10,7 @@ import {
     PartnerJsonld,
     PartnerService,
     PostJsonld,
-    PostService, TaskJsonld, TaskService
+    PostService, TaskJsonld, TaskNoteJsonld, TaskService
 } from "@app/core/api/v1";
 import {Subscription} from "rxjs";
 import {environment} from "@environments/environment";
@@ -24,6 +24,7 @@ import {AccountService} from "@app/_services";
 import {User} from "@app/_models";
 import {NewCommentComponent} from "@app/postings/new-comment/new-comment.component";
 import {NewPartnerComponent} from "@app/partners/new-partner/new-partner.component";
+import {NewTaskNoteComponent} from "@app/tasks/new-task-note/new-task-note.component";
 
 @Component({
     selector: 'app-partners-detail',
@@ -244,6 +245,19 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
         });
     }
 
+    openModalNewTaskNote(task: TaskJsonld) {
+        const modalRefTaskNote = this.modalService.open(NewTaskNoteComponent, this.modalOptions);
+        let taskNote: TaskNoteJsonld = {} as TaskNoteJsonld;
+        taskNote.task = task.id ?? null;
+        modalRefTaskNote.componentInstance.taskNote = taskNote;
+        modalRefTaskNote.componentInstance.submit.subscribe((modalStatus: ModalStatus) => {
+            if (modalStatus === ModalStatus.Submitted) {
+                modalRefTaskNote.dismiss();
+                this.getTasksData();
+            }
+        });
+    }
+
     openModalNewPosting() {
         const modalRefPosting = this.modalService.open(NewPostingComponent, this.modalOptions);
         let posting: PostJsonld = {} as PostJsonld;
@@ -282,6 +296,17 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
         });
     }
 
+    openModalEditTaskNote(taskNote: TaskNoteJsonld) {
+        const modalRefTaskNote = this.modalService.open(NewTaskNoteComponent, this.modalOptions);
+        modalRefTaskNote.componentInstance.taskNote = taskNote;
+        modalRefTaskNote.componentInstance.submit.subscribe((modalStatus: ModalStatus) => {
+            if (modalStatus === ModalStatus.Submitted) {
+                modalRefTaskNote.dismiss();
+                this.getTasksData();
+            }
+        });
+    }
+
     openModalEditPosting(post: PostJsonld) {
         const modalRefPostingEdit = this.modalService.open(NewPostingComponent, this.modalOptions);
         modalRefPostingEdit.componentInstance.posting = post;
diff --git a/matsen-tool/src/app/postings/new-comment/new-comment.component.ts b/matsen-tool/src/app/postings/new-comment/new-comment.component.ts
index 4123435..635f378 100644
--- a/matsen-tool/src/app/postings/new-comment/new-comment.component.ts
+++ b/matsen-tool/src/app/postings/new-comment/new-comment.component.ts
@@ -33,9 +33,9 @@ export class NewCommentComponent implements OnInit {
     onSubmit() {
         if (this.commentForm.valid) {
             if (this.comment.id === null || this.comment.id === undefined) {
-                // Create new post
+                // Create new comment
                 this.commentSub = this.commentService.commentsPost(
-                    this.commentForm.value as PostJsonld
+                    this.commentForm.value as CommentJsonld
                 ).subscribe(
                     data => {
                         this.commentForm.reset();
@@ -43,10 +43,10 @@ export class NewCommentComponent implements OnInit {
                     }
                 );
             } else {
-                // Edit post
+                // Edit comment
                 this.commentSub = this.commentService.commentsIdPatch(
                     ApiConverter.extractId(this.comment.id),
-                    this.commentForm.value as PostJsonld
+                    this.commentForm.value as CommentJsonld
                 ).subscribe(
                     data => {
                         this.commentForm.reset();
diff --git a/matsen-tool/src/app/products/new-product/new-product.component.ts b/matsen-tool/src/app/products/new-product/new-product.component.ts
index 4e9dd33..f3d9925 100644
--- a/matsen-tool/src/app/products/new-product/new-product.component.ts
+++ b/matsen-tool/src/app/products/new-product/new-product.component.ts
@@ -57,7 +57,7 @@ export class NewProductComponent implements OnInit {
     submitForm() {
         if (this.productForm.valid) {
             if (this.product.id === null || this.product.id === undefined) {
-                // Create new post
+                // Create new product
                 this.productSub = this.productService.productsPost(
                     this.productForm.value as ProductJsonld
                 ).subscribe(
@@ -67,7 +67,7 @@ export class NewProductComponent implements OnInit {
                     }
                 );
             } else {
-                // Edit post
+                // Edit product
                 this.productSub = this.productService.productsIdPatch(
                     ApiConverter.extractId(this.product.id),
                     this.productForm.value as ProductJsonld
diff --git a/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html
new file mode 100644
index 0000000..c1a35b2
--- /dev/null
+++ b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.html
@@ -0,0 +1,16 @@
+<h2 *ngIf="!taskNote.id">{{'basic.new-comment' | translate}}</h2>
+<h2 *ngIf="taskNote.id">{{'basic.edit-comment' | translate}}</h2>
+<div class="spt-form">
+    <form [formGroup]="taskNoteForm" (ngSubmit)="onSubmit()">
+        <div class="mb-3">
+            <label for="message" class="form-label">{{'form.comment' | translate}}:</label>
+            <input type="text" class="form-control" id="message" formControlName="message" />
+            <div class="form-text" *ngIf="taskNoteForm.get('message')?.invalid && taskNoteForm.get('message')?.touched">
+                {{'form.comment' | translate}} {{'form.mandatory' | translate}}.
+            </div>
+        </div>
+
+        <button type="submit" class="btn btn-primary" [disabled]="taskNoteForm.invalid">{{'form.send' | translate}}</button>
+    </form>
+</div>
+
diff --git a/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.scss b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.spec.ts b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.spec.ts
new file mode 100644
index 0000000..be4258c
--- /dev/null
+++ b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NewTaskNoteComponent } from './new-task-note.component';
+
+describe('NewTaskNoteComponent', () => {
+  let component: NewTaskNoteComponent;
+  let fixture: ComponentFixture<NewTaskNoteComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [NewTaskNoteComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(NewTaskNoteComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.ts b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.ts
new file mode 100644
index 0000000..c3cff06
--- /dev/null
+++ b/matsen-tool/src/app/tasks/new-task-note/new-task-note.component.ts
@@ -0,0 +1,59 @@
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {TaskJsonld, TaskNoteJsonld, TaskNoteService} from "@app/core/api/v1";
+import {ModalStatus} from "@app/_helpers/modal.states";
+import {FormGroup} from "@angular/forms";
+import {Subscription} from "rxjs";
+import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer";
+import {ApiConverter} from "@app/_helpers/api.converter";
+import {taskNoteForm} from "@app/_forms/apiForms";
+
+@Component({
+  selector: 'app-new-task-note',
+  templateUrl: './new-task-note.component.html',
+  styleUrl: './new-task-note.component.scss'
+})
+export class NewTaskNoteComponent {
+  @Input() public taskNote!: TaskNoteJsonld;
+  @Output() public submit: EventEmitter<ModalStatus> = new EventEmitter<ModalStatus>();
+
+  protected taskNoteForm: FormGroup;
+  protected taskNoteSub: Subscription;
+
+  constructor(
+      private taskNoteService: TaskNoteService
+  ) {
+    this.taskNoteForm = taskNoteForm;
+    this.taskNoteSub = new Subscription();
+  }
+
+  ngOnInit(): void {
+    this.taskNoteForm = FormGroupInitializer.initFormGroup(this.taskNoteForm, this.taskNote);
+  }
+
+  onSubmit() {
+    if (this.taskNoteForm.valid) {
+      if (this.taskNote.id === null || this.taskNote.id === undefined) {
+        // Create new taskNote
+        this.taskNoteSub = this.taskNoteService.taskNotesPost(
+            this.taskNoteForm.value as TaskNoteJsonld
+        ).subscribe(
+            data => {
+              this.taskNoteForm.reset();
+              this.submit.emit(ModalStatus.Submitted);
+            }
+        );
+      } else {
+        // Edit taskNote
+        this.taskNoteSub = this.taskNoteService.taskNotesIdPatch(
+            ApiConverter.extractId(this.taskNote.id),
+            this.taskNoteForm.value as TaskNoteJsonld
+        ).subscribe(
+            data => {
+              this.taskNoteForm.reset();
+              this.submit.emit(ModalStatus.Submitted);
+            }
+        );
+      }
+    }
+  }
+}
diff --git a/matsen-tool/src/app/tasks/new-task/new-task.component.ts b/matsen-tool/src/app/tasks/new-task/new-task.component.ts
index e0fa9cb..2eaf884 100644
--- a/matsen-tool/src/app/tasks/new-task/new-task.component.ts
+++ b/matsen-tool/src/app/tasks/new-task/new-task.component.ts
@@ -76,7 +76,7 @@ export class NewTaskComponent implements OnInit {
     onSubmit() {
         if (this.taskForm.valid) {
             if (this.task.id === null || this.task.id === undefined) {
-                // Create new post
+                // Create new task
                 this.taskSub = this.taskService.tasksPost(
                     this.taskForm.value as TaskJsonld
                 ).subscribe(
@@ -86,7 +86,7 @@ export class NewTaskComponent implements OnInit {
                     }
                 );
             } else {
-                // Edit post
+                // Edit task
                 this.taskSub = this.taskService.tasksIdPatch(
                     ApiConverter.extractId(this.task.id),
                     this.taskForm.value as TaskJsonld