diff --git a/src/common/email.py b/src/common/email.py
index 1c4151ebb776e983001a6f4a7690b904e66148ad..96b34ca8c412cbc4d36bdf9340f1296fc31d77e5 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -1,32 +1,51 @@
 from django.core.mail import send_mail
+import codecs
 
+sender_email = 'noreply@kszkepzes.sch.bme.hu'
+link = 'kszkepzes.sch.bme.hu/homework'
 
-def registration(email):
-    subject = "REGISTRATION TEST"
-    message = "Üdvözlünk a kszképzésen!"
-    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
 
+def read_email(name):
+    with codecs.open('common/emails/' + name, 'r', 'utf-8') as myfile:
+        data = myfile.read()
+    return data
 
-def admitted(email):
-    subject = "ADMITTED TEST"
-    message = "GratulĂĄlunk, te vagy a kivĂĄlasztott!!"
-    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
 
+def registration(user):
+    subject = "KszkĂŠpzĂŠs regisztrĂĄciĂł"
+    message = read_email('registration.txt')
+    message = str.format(message %{'name': user.get_full_name()})
+    send_mail(subject, message, sender_email, [user.email, ])
 
-def denied(email):
-    subject = "DENIED TEST"
-    message = "Sajnos idĂŠn nem nyertĂŠl felvĂŠtelt, prĂłbĂĄld meg legkĂśzelebb"
-    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
 
+def admitted(user):
+    subject = "JelentkezĂŠs eredmĂŠnye"
+    message = read_email('admitted.txt')
+    message = str.format(message % {'name': user.get_full_name()})
+    send_mail(subject, message, sender_email, [user.email, ])
 
-def new_homework(emails):
-    subject = "NEW HOMEWORK TEST"
-    message = "Szia!\nEgy Ăşj hĂĄzi lett kiadva, ha tĂ­z percen belĂźl megoldod akkor fasza gyerek vagy," \
-              " ha nem ĂŠleted vĂŠgĂŠig bĂĄnnifogod..."
-    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', emails)
 
+def denied(user):
+    subject = "JelentkezĂŠs eredmĂŠnye"
+    message = read_email('denied.txt')
+    message = str.format(message % {'name': user.get_full_name()})
+    send_mail(subject, message, sender_email, [user.email, ])
 
-def homework_corrected(email):
-    subject = "HOMEWORK CORRECTED TEST"
-    message = "NagyszerĹą mentoraink kijavĂ­tottĂĄk hĂĄzifeladatod, vajon most kaptĂĄl meglepit?!"
-    send_mail(subject, message, 'noreply@devteam.sch.bme.hu', [email, ])
+
+def new_homework(user, deadline):
+    deadline = deadline.strftime('%Y-%m-%d %H:%M')
+    subject = "Új házifeladat"
+    message = read_email('new_homework.txt')
+    message = str.format(message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
+    send_mail(subject, message, sender_email, [user.email, ])
+
+
+def homework_corrected(user, title, accepted):
+    subject = "HĂĄzifeladat eredmĂŠnye"
+    if accepted:
+        status = 'Elfogadva'
+    else:
+        status = 'HibĂĄs'
+    message = read_email('homework_corrected.txt')
+    message = str.format(message % {'name': user.get_full_name(), 'link': link, 'status': status, 'title': title })
+    send_mail(subject, message, sender_email, [user.email, ])
diff --git a/src/stats/views.py b/src/stats/views.py
index 69ab78cb832c266e1e04a726ed6158f55455a6b3..393de2ce77b1bf476925663fd18b9ef967af4237 100644
--- a/src/stats/views.py
+++ b/src/stats/views.py
@@ -31,4 +31,3 @@ class NoteViewSet(viewsets.ModelViewSet):
         if event_id is not None:
             return queryset.filter(event=event_id)
         return queryset
-