diff --git a/apps/freenet-email-app/Makefile b/apps/freenet-email-app/Makefile
index d1002038a..b7facbed9 100644
--- a/apps/freenet-email-app/Makefile
+++ b/apps/freenet-email-app/Makefile
@@ -10,6 +10,10 @@ AFT_GENERATOR := $(FREENET_DIR)/modules/antiflood-tokens/delegates/token-generat
 IDENTITY_DELEGATE := $(FREENET_DIR)/modules/identity-management
 WEB_DIR_SRC := $(FREENET_DIR)/apps/freenet-email-app/web/src
 
+IDENTITY_DELEGATE_PRIVATE_KEY := identity-manager-key.private.pem
+PATH_TO_IDENTITY_DELEGATE := $(IDENTITY_DELEGATE)/build/$(IDENTITY_DELEGATE_PRIVATE_KEY)
+
+
 ifeq ($(CARGO_TARGET_DIR),)
 $(error CARGO_TARGET_DIR is not set)
 endif
@@ -31,10 +35,13 @@ build-tool:
 	cargo install --force --path $(FREENET_DIR)/crates/fdev
 
 generate-id-manager-key:
-	FILE="$(IDENTITY_DELEGATE)/build/identity-manager-key.private.pem"
-	echo $$FILE ;
-ifneq ("$(wildcard $(FILE))","")
-    cd $(IDENTITY_DELEGATE) && cargo run -- --path "$(IDENTITY_DELEGATE)/build/" ; 
+	echo "test 3"
+	F=$(wildcard $(PATH_TO_IDENTITY_DELEGATE))
+	echo "test 3"
+ifeq ($$F, $(IDENTITY_DELEGATE_PRIVATE_KEY))
+	echo "file $(IDENTITY_DELEGATE_PRIVATE_KEY) already exists. Skipping." ;
+else
+	cd $(IDENTITY_DELEGATE) && cargo run -- --path "$(IDENTITY_DELEGATE)/build/" ;
 endif
 
 build-inbox:
diff --git a/build-all.sh b/build-all.sh
index 375158842..c2c2ad94b 100644
--- a/build-all.sh
+++ b/build-all.sh
@@ -28,8 +28,7 @@ cd ../.. &&
 cargo install --path crates/core --force &&
 cargo install --path crates/fdev --force &&
 cd ./modules/identity-management/ && make build &&
-cd ../antiflood-tokens/ &&
-rm Cargo.lock ;
-make build &&
-cd ../../apps/freenet-microblogging && make build &&
-cd ../../apps/freenet-email-app && make build
+cd ../antiflood-tokens/ && rm Cargo.lock ; make build &&
+cd ../../ && 
+make -C ./apps/freenet-microblogging build &&
+&& make -C ./apps/freenet-email-app build