diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go
index fd8579a2ec..85d95ee421 100644
--- a/services/activitylog/pkg/service/http.go
+++ b/services/activitylog/pkg/service/http.go
@@ -120,35 +120,19 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
 			// error already logged in unwrapEvent
 			continue
 		case events.UploadReady:
-			if ev.FileRef.GetPath() == "/" {
-				message = MessageResourceInSpaceCreated
-			} else {
-				message = MessageResourceInFolderCreated
-			}
+			message = MessageResourceCreated
 			ts = utils.TSToTime(ev.Timestamp)
 			vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(ev.ExecutingUser.GetId(), ev.ExecutingUser.GetDisplayName()), WithSpace(toSpace(ev.FileRef)))
 		case events.FileTouched:
-			if ev.Ref.GetPath() == "/" {
-				message = MessageResourceInSpaceCreated
-			} else {
-				message = MessageResourceInFolderCreated
-			}
+			message = MessageResourceCreated
 			ts = utils.TSToTime(ev.Timestamp)
 			vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
 		case events.ContainerCreated:
-			if ev.Ref.GetPath() == "/" {
-				message = MessageResourceInSpaceCreated
-			} else {
-				message = MessageResourceInFolderCreated
-			}
+			message = MessageResourceCreated
 			ts = utils.TSToTime(ev.Timestamp)
 			vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
 		case events.ItemTrashed:
-			if ev.Ref.GetPath() == "/" {
-				message = MessageResourceInSpaceTrashed
-			} else {
-				message = MessageResourceInFolderTrashed
-			}
+			message = MessageResourceTrashed
 			ts = utils.TSToTime(ev.Timestamp)
 			vars, err = s.GetVars(ctx, WithTrashedResource(ev.Ref, ev.ID), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
 		case events.ItemMoved:
@@ -157,11 +141,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
 				message = MessageResourceRenamed
 				vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithOldResource(ev.OldReference), WithUser(ev.Executant, ""))
 			case false:
-				if ev.Ref.GetPath() == "/" {
-					message = MessageResourceInSpaceMoved
-				} else {
-					message = MessageResourceInFolderMoved
-				}
+				message = MessageResourceMoved
 				vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
 			}
 			ts = utils.TSToTime(ev.Timestamp)
diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go
index f73e988742..8714ff9f10 100644
--- a/services/activitylog/pkg/service/response.go
+++ b/services/activitylog/pkg/service/response.go
@@ -20,20 +20,17 @@ import (
 
 // Translations
 var (
-	MessageResourceInSpaceCreated  = l10n.Template("{user} added {resource} to {space}")
-	MessageResourceInSpaceTrashed  = l10n.Template("{user} deleted {resource} from {space}")
-	MessageResourceInSpaceMoved    = l10n.Template("{user} moved {resource} to {space}")
-	MessageResourceInFolderCreated = l10n.Template("{user} added {resource} to {folder}")
-	MessageResourceInFolderTrashed = l10n.Template("{user} deleted {resource} from {folder}")
-	MessageResourceInFolderMoved   = l10n.Template("{user} moved {resource} to {folder}")
-	MessageResourceRenamed         = l10n.Template("{user} renamed {oldResource} to {resource}")
-	MessageShareCreated            = l10n.Template("{user} shared {resource} with {sharee}")
-	MessageShareDeleted            = l10n.Template("{user} removed {sharee} from {resource}")
-	MessageLinkCreated             = l10n.Template("{user} shared {resource} via link")
+	MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}")
+	MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}")
+	MessageResourceMoved   = l10n.Template("{user} moved {resource} to {folder}")
+	MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}")
+	MessageShareCreated    = l10n.Template("{user} shared {resource} with {sharee}")
+	MessageShareDeleted    = l10n.Template("{user} removed {sharee} from {resource}")
+	MessageLinkCreated     = l10n.Template("{user} shared {resource} via link")
 	MessageLinkUpdated     = l10n.Template("{user} updated {field} for a link {token} on {resource}")
-	MessageLinkDeleted             = l10n.Template("{user} removed link to {resource}")
-	MessageSpaceShared             = l10n.Template("{user} added {sharee} as member of {space}")
-	MessageSpaceUnshared           = l10n.Template("{user} removed {sharee} from {space}")
+	MessageLinkDeleted     = l10n.Template("{user} removed link to {resource}")
+	MessageSpaceShared     = l10n.Template("{user} added {sharee} as member of {space}")
+	MessageSpaceUnshared   = l10n.Template("{user} removed {sharee} from {space}")
 )
 
 // GetActivitiesResponse is the response on GET activities requests