diff --git a/.env b/.env
index 05ed185..23ac77e 100644
--- a/.env
+++ b/.env
@@ -2,4 +2,5 @@
   AMAZON_SECRET_ACCESS_KEY=HIFVed2iqt3PRCsvrO9Evqxr/7/u+UmY8WrTItq3
   AMAZON_REGION=eu-west-1
   APP_URL=http://localhost:3001
+  SOURCE_EMAIL=info@saburly.com
   
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c2658d7..713d500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 node_modules/
+.env
diff --git a/app/helpers/awsEmail.js b/app/helpers/awsEmail.js
index b664499..f0f01e6 100644
--- a/app/helpers/awsEmail.js
+++ b/app/helpers/awsEmail.js
@@ -1,6 +1,8 @@
 
 const dotenv = require('dotenv');
 dotenv.config();
+const { getRealEstateTypeEnum } = require('./enums');
+const { getRegionName, getMunicipalityName } = require('./codes');
 const AWS = require('aws-sdk');
 AWS.config.update({
   region: process.env.AMAZON_REGION,
@@ -10,7 +12,6 @@ AWS.config.update({
     secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY
   }
 });
-const { getRegionName, getMunicipalityName } = require('./codes');
 
 const sendTemplatedEmail = async (email, request) => {
 
@@ -38,9 +39,9 @@ const sendTemplatedEmail = async (email, request) => {
         Data: `Javimi Potvrda: ${request.realEstateType} ${getRegionName(request.region)}, ${getMunicipalityName(request.region, request.municipality)}`
       }
     },
-    Source: 'info@saburly.com', /* required */
+    Source: process.env.SOURCE_EMAIL, /* required */
     ReplyToAddresses: [
-      'info@saburly.com',
+      process.env.SOURCE_EMAIL,
     ],
   };
 
@@ -49,17 +50,22 @@ const sendTemplatedEmail = async (email, request) => {
 }
 
 const getEmailHTML = (realestateRequest) => {
+  const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
+  const gardenSize = realEstateType.hasGardenSize ? `<div><strong>Kvadratura okućnice: Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2  </strong></div>` : ``
 
   return `<h1> Zdravo, 
   Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima. </h1>
   <h2> Ovo je tražena nekretnina:  </h2> 
   <div>
-  <div> <strong>Tip nekretnine: ${realestateRequest.realEstateType} </strong></div>
-  <div><strong>Područje ${getRegionName(realestateRequest.region)} </strong></div>
-  <div><strong>Mjesto ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)} </strong></div>
-  <div><strong>Kvadratura nekretnine Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2  </strong></div>
-  <div><strong>Kvadratura okućnice Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2  </strong></div>
-  <div><strong>Cijena  ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM  </strong></div>
+  <div> <strong>Tip nekretnine: ${realEstateType.title} </strong></div>
+  <div><strong>Područje: ${getRegionName(realestateRequest.region)} </strong></div>
+  <div><strong>Mjesto: ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)} </strong></div>
+  <div><strong>Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2  </strong></div>
+  ${gardenSize}
+  <div><strong>Cijena: ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM  </strong></div>
+  </div>
+  <div> 
+
   </div>
   <div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${process.env.APP_URL}/odjava/${realestateRequest.uniqueId} </strong></div>
   <div><strong>Ako želiš promijeniti uslove pretrage klikni  ${process.env.APP_URL}/pregled/${realestateRequest.uniqueId} </strong></div>
@@ -70,10 +76,13 @@ Javimi tim.
 }
 
 const getEmaiTextVersion = (realestateRequest) => {
+  const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
+  const gardenSize = realEstateType.hasGardenSize ? "Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax  : ""
+
   const text = "Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima \n Ovo je tražena nekretnina: \n , Tip nekretnine: "
     + realestateRequest.realEstateType + "\n Područje" + getRegionName(realestateRequest.region) + "\n Mjesto " + getMunicipalityName(realestateRequest.region, realestateRequest.municipality)
     + "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX +
-    "\n Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax +
+    + gardenSize
     "\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax +
     "\n Ako želis prestati dobijati obavještenja za ovu pretragu klikni" + process.env.APP_URL + "/odjava/" + realestateRequest.uniqueId +
     "\n Ako želiš promijeniti uslove pretrage klikni " + process.env.APP_URL + "/odpregled/" + realestateRequest.uniqueId +
diff --git a/development.env b/development.env
new file mode 100644
index 0000000..3980ba3
--- /dev/null
+++ b/development.env
@@ -0,0 +1,5 @@
+  AMAZON_ACCES_KEY_ID=(your-key-here)
+  AMAZON_SECRET_ACCESS_KEY=(your-key-here)
+  AMAZON_REGION=eu-west-1
+  APP_URL=http://localhost:3001
+  SOURCE_EMAIL=info@saburly.com
\ No newline at end of file