diff --git a/src/main/java/org/olat/course/nodes/projectbroker/ProjectEditDetailsFormController.java b/src/main/java/org/olat/course/nodes/projectbroker/ProjectEditDetailsFormController.java
index 8fec66f84bd041fb6f8f231575663a6ec55c47e6..7b3b2e461d6907f87f23d7a22e237679f13705a5 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/ProjectEditDetailsFormController.java
+++ b/src/main/java/org/olat/course/nodes/projectbroker/ProjectEditDetailsFormController.java
@@ -146,6 +146,12 @@ public class ProjectEditDetailsFormController extends FormBasicController {
 			projectTitle.setErrorKey("form.error.project.title.is.empty", null);
 			return false;
 		}
+		
+		// http://jira.openolat.org/browse/OO-131  check for too long filename
+		if (attachmentFileName.getUploadFileName().length() > 99) {
+			attachmentFileName.setErrorKey("form.error.project.filenametoolong", null);
+			return false;
+		}
 		return true;
 	}
 
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_de.properties
index 9a0c510c6b67d7a07f0b5becfec97fad5181a107..06f075b0a223b8e6be780e0ef3bdaaf9d1bd1d1c 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_de.properties
@@ -147,6 +147,7 @@ handout_event=Abgabetermin
 from.error.date.start.after.end=Starttermin nach Endtermin
 form.error.project.title.already.exist=Es existiert bereits ein Thema mit diesem Namen.
 form.error.project.title.is.empty=Der Titel darf nicht leer sein.
+form.error.project.filenametoolong=Der gewählte Dateinamen ist zu lang (max 100 Zeichen).
 
 mail.enrolled.to.participant.subject=Wahl des Themas: $projectTitle
 mail.enrolled.to.participant.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie haben am $currentDate das Thema "$projectTitle" gew\u00E4hlt.
diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_en.properties
index 1fcf05c512b0ec2017ceda17877a0e86f6add437..cc68cbcb1c2fa4910fcc09674264e15d27b9dfdb 100644
--- a/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/projectbroker/_i18n/LocalStrings_en.properties
@@ -120,6 +120,8 @@ form.accountmanagement.no.account.manager.group=No topic authors available.
 form.accountmanagement.title=Administer topic authors
 form.error.project.title.already.exist=A topic with this title already exists.
 form.error.project.title.is.empty=This title is mandatory.
+form.error.project.filenametoolong=Filename has to many characters (max 100).
+
 form.modules.dropbox=Drop box
 form.modules.returnbox=Return box
 form.modules.scoring=Assessment